summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-07-23 12:47:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-07-23 12:47:23 (GMT)
commitafed51933709cae475a09cb6b3cc8e5d2fe346a2 (patch)
tree1194bb908cb4c58e685e1e7e81689bc190e7edf6
parent51f818bf24cbfc542489edf6e0dbdda2d35a4787 (diff)
parente68f0cb3d4621f3374f585ba191b8d54056eb064 (diff)
downloadCMake-afed51933709cae475a09cb6b3cc8e5d2fe346a2.zip
CMake-afed51933709cae475a09cb6b3cc8e5d2fe346a2.tar.gz
CMake-afed51933709cae475a09cb6b3cc8e5d2fe346a2.tar.bz2
Merge topic 'osx-iframework'
e68f0cb3 OS X: Use -iframework with AppleClang only on version >= 4.2
-rw-r--r--Modules/Platform/Darwin-AppleClang-C.cmake5
-rw-r--r--Modules/Platform/Darwin-AppleClang-CXX.cmake5
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()