diff options
| author | Tim Landscheidt <tim@tim-landscheidt.de> | 2019-01-26 17:40:21 +0000 |
|---|---|---|
| committer | Tim Landscheidt <tim@tim-landscheidt.de> | 2019-01-26 18:02:14 +0000 |
| commit | 1116472dce6523ce18a7a9ea9376aac8bed9f864 (patch) | |
| tree | 94e2970eb70d3af88e9ec5e2397086ad68484198 | |
| parent | 33cbed3211ccab0f18e1ad7af3fea6af697df2e0 (diff) | |
| download | fork-ledger-1116472dce6523ce18a7a9ea9376aac8bed9f864.tar.gz fork-ledger-1116472dce6523ce18a7a9ea9376aac8bed9f864.tar.bz2 fork-ledger-1116472dce6523ce18a7a9ea9376aac8bed9f864.zip | |
Use CMAKE_CXX_COMPILER_ID for conditions based on compiler
CMAKE_CXX_COMPILER is the path to the compiler binary and does not
need to follow a specific pattern. For example, on Linux with GCC and
without an explicit "-DCMAKE_CXX_COMPILER:PATH=" option,
CMAKE_CXX_COMPILER is "/usr/bin/c++" which does not match "g++".
CMAKE_CXX_COMPILER_ID however will always reliably be "Clang" or
"GNU".
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c85a5157..c2c27097 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,8 +296,7 @@ configure_file( ${PROJECT_SOURCE_DIR}/src/system.hh.in ${PROJECT_BINARY_DIR}/system.hh) -if((CMAKE_CXX_COMPILER MATCHES "clang") OR - (CMAKE_CXX_COMPILER MATCHES "clang\\+\\+")) +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9cd54dbe..06acecf2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -144,7 +144,7 @@ if (WIN32 OR CYGWIN) endif() if (CMAKE_BUILD_TYPE STREQUAL "Debug") - if (CMAKE_CXX_COMPILER MATCHES "clang\\+\\+") + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") add_definitions( # -Weverything # -Wno-disabled-macro-expansion @@ -199,7 +199,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") DEPENDS ${_header_filename}) endmacro(ADD_PCH_RULE _header_filename _src_list _other_srcs) - elseif (CMAKE_CXX_COMPILER MATCHES "g\\+\\+") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(GXX_WARNING_FLAGS -pedantic -Wall |