diff options
| author | R.J.V. Bertin <rjvbertin@gmail.com> | 2017-06-14 12:59:07 +0200 |
|---|---|---|
| committer | R.J.V. Bertin <rjvbertin@gmail.com> | 2017-06-14 12:59:07 +0200 |
| commit | 51f1fccf1cf3b9ed63d6aeba2c4cdb1d3d8f7a6b (patch) | |
| tree | 51b6e3bd7d21e870689c9f65b40588bf5ea80004 | |
| parent | 6326f18e711637cd8adc50fe2e6f5b5754212f4b (diff) | |
| download | extra-cmake-modules-51f1fccf1cf3b9ed63d6aeba2c4cdb1d3d8f7a6b.tar.gz extra-cmake-modules-51f1fccf1cf3b9ed63d6aeba2c4cdb1d3d8f7a6b.tar.bz2 | |
detect Xcode <= 6.2 from Clang version only
This modifies 340b969f54d2f271e925ed7f84c831e1e4b2ccd0 by testing for
Xcode <= 6.2 using the AppleClang version scheme only, to account for
rare conditions where the compiler ID is not AppleClang.
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index 2de98c04..c27fa799 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -376,7 +376,8 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR endif() if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)) - if (NOT (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1.0.6000000)) + if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0.0.1000000 AND + CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1.0.6000000)) # -Wdate-time: warn if we use __DATE__ or __TIME__ (we want to be able to reproduce the exact same binary) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdate-time") endif() |