[Cmake-commits] CMake branch, next, updated. v3.2.1-1190-g08f38a3

[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  08f38a325700aaef5d64f1664d0d63573206836c (commit)
       via  6ab1413499284dc8e1d7a8ac1f1940798a79e674 (commit)
       via  52642b466ec47f61195b4112407845e62b381596 (commit)
      from  d4e11ba12596763942888e1c7b6b46949e687c73 (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=08f38a325700aaef5d64f1664d0d63573206836c
commit 08f38a325700aaef5d64f1664d0d63573206836c
Merge: d4e11ba 6ab1413
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 24 11:25:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 24 11:25:28 2015 -0400

    Merge topic 'xcode5-xctest' into next
    
    6ab14134 Tests: Enable XCTest tests for Xcode 5
    52642b46 OS X: Look for Xcode 5 platform-specific Frameworks


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ab1413499284dc8e1d7a8ac1f1940798a79e674
commit 6ab1413499284dc8e1d7a8ac1f1940798a79e674
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Mar 23 18:06:46 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 24 11:24:56 2015 -0400

    Tests: Enable XCTest tests for Xcode 5
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 49fd02b..41032f8 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1519,7 +1519,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
       )
   endif()
 
-  if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 6
+  if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5
      AND OSX_VERSION MATCHES "^([0-9]+\\.[0-9]+)")
     set(XCTest_BUILD_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_MATCH_1})
     ADD_TEST_MACRO(XCTest ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> -V)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52642b466ec47f61195b4112407845e62b381596
commit 52642b466ec47f61195b4112407845e62b381596
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Mar 20 23:48:22 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 24 11:23:40 2015 -0400

    OS X: Look for Xcode 5 platform-specific Frameworks
    
    The Xcode 5 platform specific framework locations differ from the Xcode
    6 ones.  Look first for the Xcode 6 ones, then for iOS Xcode 5 ones and
    last for the Xcode 5 OS X ones.
    
    For reference, the XCTest.framework is located as follows:
    
     Xcode511.app/Contents/Developer/Library/Frameworks/XCTest.framework
     Xcode511.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/Developer/Library/Frameworks/XCTest.framework
     Xcode511.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.1.sdk/Developer/Library/Frameworks/XCTest.framework
    
     Xcode601.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework
     Xcode601.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework
     Xcode601.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks/XCTest.framework
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index b912d98..4e4810a 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -167,12 +167,20 @@ if(_CMAKE_OSX_SYSROOT_PATH)
     ${_CMAKE_OSX_SYSROOT_PATH}/System/Library/Frameworks
     )
   # add platform developer framework path if exists
-  get_filename_component(_CMAKE_OSX_PLATFORM_FRAMEWORK_PATH
-    ${_CMAKE_OSX_SYSROOT_PATH}/../../Library/Frameworks ABSOLUTE)
-  if(IS_DIRECTORY ${_CMAKE_OSX_PLATFORM_FRAMEWORK_PATH})
-    list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
-      ${_CMAKE_OSX_PLATFORM_FRAMEWORK_PATH})
-  endif()
+  foreach(_path
+    # Xcode 6
+    ${_CMAKE_OSX_SYSROOT_PATH}/../../Library/Frameworks
+    # Xcode 5 iOS
+    ${_CMAKE_OSX_SYSROOT_PATH}/Developer/Library/Frameworks
+    # Xcode 5 OSX
+    ${_CMAKE_OSX_SYSROOT_PATH}/../../../../../Library/Frameworks
+    )
+    get_filename_component(_abolute_path "${_path}" ABSOLUTE)
+    if(EXISTS "${_abolute_path}")
+      list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH "${_abolute_path}")
+      break()
+    endif()
+  endforeach()
 endif()
 list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
   /Library/Frameworks

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

Summary of changes:


hooks/post-receive
-- 
CMake