From dd7fb31309f33f49b95077c5c09933a502864332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Sun, 18 Jun 2017 18:10:03 +0200 Subject: [PATCH] Made CMake configuration consistent. --- CMakeLists.txt | 2 +- lib/pddlparse/CMakeLists.txt | 2 +- lib/tokenize/CMakeLists.txt | 2 +- lib/tokenize/tests/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75620dc..2bb1e5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))) # Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support. # Rationale in https://github.com/ninja-build/ninja/issues/814 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") + set(CMAKE_CXX_FLAGS "-fdiagnostics-color=always ${CMAKE_CXX_FLAGS}") endif() add_subdirectory(lib/tokenize) diff --git a/lib/pddlparse/CMakeLists.txt b/lib/pddlparse/CMakeLists.txt index 60b674a..07954c8 100644 --- a/lib/pddlparse/CMakeLists.txt +++ b/lib/pddlparse/CMakeLists.txt @@ -19,7 +19,7 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))) # Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support. # Rationale in https://github.com/ninja-build/ninja/issues/814 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") + set(CMAKE_CXX_FLAGS "-fdiagnostics-color=always ${CMAKE_CXX_FLAGS}") endif() add_subdirectory(src) diff --git a/lib/tokenize/CMakeLists.txt b/lib/tokenize/CMakeLists.txt index d0ce46c..985c5f6 100644 --- a/lib/tokenize/CMakeLists.txt +++ b/lib/tokenize/CMakeLists.txt @@ -19,7 +19,7 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))) # Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support. # Rationale in https://github.com/ninja-build/ninja/issues/814 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") + set(CMAKE_CXX_FLAGS "-fdiagnostics-color=always ${CMAKE_CXX_FLAGS}") endif() add_subdirectory(src) diff --git a/lib/tokenize/tests/CMakeLists.txt b/lib/tokenize/tests/CMakeLists.txt index 09119ec..723b190 100644 --- a/lib/tokenize/tests/CMakeLists.txt +++ b/lib/tokenize/tests/CMakeLists.txt @@ -16,6 +16,6 @@ target_include_directories(${target} PRIVATE ${includes}) target_link_libraries(${target} ${libraries}) add_custom_target(run-tokenize-tests - COMMAND ${CMAKE_BINARY_DIR}/bin/tokenize-tests + COMMAND ${CMAKE_BINARY_DIR}/bin/tokenize-tests --use-colour=yes DEPENDS ${target} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5c31fd2..089ad57 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,6 +19,6 @@ target_include_directories(${target} PRIVATE ${includes}) target_link_libraries(${target} ${libraries}) add_custom_target(run-tests - COMMAND ${CMAKE_BINARY_DIR}/bin/tests + COMMAND ${CMAKE_BINARY_DIR}/bin/tests --use-colour=yes DEPENDS ${target} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests)