[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2783-g12c20b8

[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  12c20b8ccf27c6b693b2cbdff19b525de66708c4 (commit)
       via  6ceb9a33d9227a5190454f3863ba870f7641e99d (commit)
      from  6125dddec9e337338782e1bc4e0bbefb39ee3ac1 (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=12c20b8ccf27c6b693b2cbdff19b525de66708c4
commit 12c20b8ccf27c6b693b2cbdff19b525de66708c4
Merge: 6125ddd 6ceb9a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 6 11:46:54 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 11:46:54 2014 -0400

    Merge topic 'osx-iframework' into next
    
    6ceb9a33 OS X: Use -iframework only on sufficiently new Clang


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ceb9a33d9227a5190454f3863ba870f7641e99d
commit 6ceb9a33d9227a5190454f3863ba870f7641e99d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 6 11:40:46 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 6 11:45:02 2014 -0400

    OS X: Use -iframework only on sufficiently new Clang
    
    While at it, separate the flag from its value by a space.

diff --git a/Modules/Platform/Darwin-Clang.cmake b/Modules/Platform/Darwin-Clang.cmake
index 13d2232..4cded47 100644
--- a/Modules/Platform/Darwin-Clang.cmake
+++ b/Modules/Platform/Darwin-Clang.cmake
@@ -24,5 +24,7 @@ macro(__darwin_compiler_clang lang)
   set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle -Wl,-headerpad_max_install_names")
   set(CMAKE_${lang}_SYSROOT_FLAG "-isysroot")
   set(CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG "-mmacosx-version-min=")
-  set(CMAKE_${lang}_SYSTEM_FRAMEWORK_SEARCH_FLAG -iframework)
+  if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.1)
+    set(CMAKE_${lang}_SYSTEM_FRAMEWORK_SEARCH_FLAG "-iframework ")
+  endif()
 endmacro()
diff --git a/Modules/Platform/Darwin-GNU.cmake b/Modules/Platform/Darwin-GNU.cmake
index 9961e91..87d1d23 100644
--- a/Modules/Platform/Darwin-GNU.cmake
+++ b/Modules/Platform/Darwin-GNU.cmake
@@ -25,7 +25,7 @@ macro(__darwin_compiler_gnu lang)
   set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle -Wl,-headerpad_max_install_names")
 
   if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4.3)
-    set(CMAKE_${lang}_SYSTEM_FRAMEWORK_SEARCH_FLAG -iframework)
+    set(CMAKE_${lang}_SYSTEM_FRAMEWORK_SEARCH_FLAG "-iframework ")
   endif()
 endmacro()
 

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

Summary of changes:
 Modules/Platform/Darwin-Clang.cmake |    4 +++-
 Modules/Platform/Darwin-GNU.cmake   |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake