From e68f0cb3d4621f3374f585ba191b8d54056eb064 Mon Sep 17 00:00:00 2001 From: Brad King <brad.king@kitware.com> Date: Wed, 22 Jul 2015 09:04:04 -0400 Subject: 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. --- Modules/Platform/Darwin-AppleClang-C.cmake | 5 +++++ Modules/Platform/Darwin-AppleClang-CXX.cmake | 5 +++++ 2 files changed, 10 insertions(+) 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() -- cgit v0.12