diff options
| author | René J.V. Bertin <rjvbertin@gmail.com> | 2018-11-12 11:21:07 +0100 |
|---|---|---|
| committer | René J.V. Bertin <rjvbertin@gmail.com> | 2018-11-12 11:21:07 +0100 |
| commit | d42cc5dd7c4e78db16d1f4f0c17f141ad97b4cf4 (patch) | |
| tree | 200b2f5b05b06fa6a718509f5879768194b93c4f /kde-modules | |
| parent | a1a7bfa7c3056bb7624431e587421d43d62cb08a (diff) | |
| download | extra-cmake-modules-d42cc5dd7c4e78db16d1f4f0c17f141ad97b4cf4.tar.gz extra-cmake-modules-d42cc5dd7c4e78db16d1f4f0c17f141ad97b4cf4.tar.bz2 | |
Use `MATCHES "Clang"` to detect clang
This is for compatibility with Apple's Xcode
compilers which identify as AppleClang.
Differential Revision: https://phabricator.kde.org/D16816
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDECMakeSettings.cmake | 2 | ||||
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 4 | ||||
| -rw-r--r-- | kde-modules/KDEFrameworkCompilerSettings.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake index 2dd54ed5..3f7f5a82 100644 --- a/kde-modules/KDECMakeSettings.cmake +++ b/kde-modules/KDECMakeSettings.cmake @@ -289,7 +289,7 @@ if(NOT KDE_SKIP_BUILD_SETTINGS) endif() -if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") option(ENABLE_CLAZY "Enable Clazy warnings" OFF) if(ENABLE_CLAZY) diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index 44358fb4..c713cc2f 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -341,7 +341,7 @@ endfunction() ############################################################ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR - (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR + (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE) OR (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)) # Linker warnings should be treated as errors set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}") @@ -488,7 +488,7 @@ endif() if (CMAKE_GENERATOR STREQUAL "Ninja" AND ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) OR - (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))) + (CMAKE_CXX_COMPILER_ID MATCHES "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") diff --git a/kde-modules/KDEFrameworkCompilerSettings.cmake b/kde-modules/KDEFrameworkCompilerSettings.cmake index 1d3e1f7c..b191e550 100644 --- a/kde-modules/KDEFrameworkCompilerSettings.cmake +++ b/kde-modules/KDEFrameworkCompilerSettings.cmake @@ -71,7 +71,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() endif() -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wzero-as-null-pointer-constant" ) endif() |