diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-22 13:04:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-22 13:04:04 (GMT) |
| commit | e68f0cb3d4621f3374f585ba191b8d54056eb064 (patch) | |
| tree | a241c970ea4072fa9fd43f8a8c91a88d3fef47d8 | |
| parent | 8c9c9aa07f3ffaa48ebaea6adc8027b905298338 (diff) | |
| download | CMake-e68f0cb3d4621f3374f585ba191b8d54056eb064.zip CMake-e68f0cb3d4621f3374f585ba191b8d54056eb064.tar.gz CMake-e68f0cb3d4621f3374f585ba191b8d54056eb064.tar.bz2 | |
OS X: Use -iframework with AppleClang only on version >= 4.2
Since commit v3.1.0-rc1~564^2 (OS X: Use -iframework for system
framework directories, 2014-05-05) we test the version of Clang to see
if it supports -iframework. Fix the version test used for AppleClang
since it uses a different version scheme than upstream Clang.
| -rw-r--r-- | Modules/Platform/Darwin-AppleClang-C.cmake | 5 | ||||
| -rw-r--r-- | Modules/Platform/Darwin-AppleClang-CXX.cmake | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Modules/Platform/Darwin-AppleClang-C.cmake b/Modules/Platform/Darwin-AppleClang-C.cmake index 98971bb..3216b29 100644 --- a/Modules/Platform/Darwin-AppleClang-C.cmake +++ b/Modules/Platform/Darwin-AppleClang-C.cmake @@ -1 +1,6 @@ include(Platform/Darwin-Clang-C) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.2) + set(CMAKE_C_SYSTEM_FRAMEWORK_SEARCH_FLAG "-iframework ") +else() + unset(CMAKE_C_SYSTEM_FRAMEWORK_SEARCH_FLAG) +endif() diff --git a/Modules/Platform/Darwin-AppleClang-CXX.cmake b/Modules/Platform/Darwin-AppleClang-CXX.cmake index 4e9e7c1..3fedf8c 100644 --- a/Modules/Platform/Darwin-AppleClang-CXX.cmake +++ b/Modules/Platform/Darwin-AppleClang-CXX.cmake @@ -1 +1,6 @@ include(Platform/Darwin-Clang-CXX) +if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2) + set(CMAKE_CXX_SYSTEM_FRAMEWORK_SEARCH_FLAG "-iframework ") +else() + unset(CMAKE_CXX_SYSTEM_FRAMEWORK_SEARCH_FLAG) +endif() |