diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-22 13:51:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-22 13:51:37 (GMT) |
| commit | 669922bde82d3833bd243a242d6560e4e7903276 (patch) | |
| tree | d3118b9de645eb562b6cefdb3213fe95446384e5 | |
| parent | b9fba345928e57d29ae01a54e0ce309e61291af4 (diff) | |
| parent | e68f0cb3d4621f3374f585ba191b8d54056eb064 (diff) | |
| download | CMake-669922bde82d3833bd243a242d6560e4e7903276.zip CMake-669922bde82d3833bd243a242d6560e4e7903276.tar.gz CMake-669922bde82d3833bd243a242d6560e4e7903276.tar.bz2 | |
Merge branch 'osx-iframework' into release
| -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() |