[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1247-g5b4c1f2

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5b4c1f26095ab8a8355e5326bdd4d430bba42c19 (commit)
       via  e68f0cb3d4621f3374f585ba191b8d54056eb064 (commit)
      from  c3a1c82950fdd24aa6736ab25d641194dd9dbd74 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b4c1f26095ab8a8355e5326bdd4d430bba42c19
commit 5b4c1f26095ab8a8355e5326bdd4d430bba42c19
Merge: c3a1c82 e68f0cb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 22 09:28:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 22 09:28:18 2015 -0400

    Merge topic 'osx-iframework' into next
    
    e68f0cb3 OS X: Use -iframework with AppleClang only on version >= 4.2


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e68f0cb3d4621f3374f585ba191b8d54056eb064
commit e68f0cb3d4621f3374f585ba191b8d54056eb064
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 22 09:04:04 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 22 09:04:04 2015 -0400

    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.

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()

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Darwin-AppleClang-C.cmake   |    5 +++++
 Modules/Platform/Darwin-AppleClang-CXX.cmake |    5 +++++
 2 files changed, 10 insertions(+)


hooks/post-receive
-- 
CMake