[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4346-ga2ca7b6

[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  a2ca7b6f2146e04e1a260c19d62d6b0e666568f9 (commit)
       via  1fce189e536b4ab2385ff25c9e04baf97065c2b0 (commit)
       via  6ed8504ea5633932e5db3a5a70853a763df7af50 (commit)
      from  6f892691b0138fdf655ab6b7c6c2899dc70b0320 (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=a2ca7b6f2146e04e1a260c19d62d6b0e666568f9
commit a2ca7b6f2146e04e1a260c19d62d6b0e666568f9
Merge: 6f89269 1fce189
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 27 10:22:46 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 27 10:22:46 2013 -0400

    Merge topic 'osx-find-sdk-frameworks' into next
    
    1fce189 OS X: Search system SDKs for frameworks
    6ed8504 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fce189e536b4ab2385ff25c9e04baf97065c2b0
commit 1fce189e536b4ab2385ff25c9e04baf97065c2b0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 27 10:13:53 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 27 10:18:46 2013 -0400

    OS X: Search system SDKs for frameworks
    
    In Modules/Platform/Darwin.cmake set CMAKE_SYSTEM_FRAMEWORK_PATH to
    include framework directories from inside the system SDK corresponding
    to CMAKE_OSX_SYSROOT.
    
    Suggested-by: Sean McBride <sean at rogue-research.com>

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 0930880..72844b5 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -294,6 +294,15 @@ endif()
 # set up the default search directories for frameworks
 set(CMAKE_SYSTEM_FRAMEWORK_PATH
   ~/Library/Frameworks
+  )
+if(_CMAKE_OSX_SYSROOT_PATH)
+  list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
+    ${_CMAKE_OSX_SYSROOT_PATH}/Library/Frameworks
+    ${_CMAKE_OSX_SYSROOT_PATH}/Network/Library/Frameworks
+    ${_CMAKE_OSX_SYSROOT_PATH}/System/Library/Frameworks
+    )
+endif()
+list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
   /Library/Frameworks
   /Network/Library/Frameworks
   /System/Library/Frameworks)

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

Summary of changes:
 Modules/Platform/Darwin.cmake |    9 +++++++++
 Source/CMakeVersion.cmake     |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake