[Cmake-commits] CMake branch, next, updated. v3.2.1-1181-g9df562a

[Gregor Jasny]

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  9df562aee9d17d00549722070d06da6967f7a154 (commit)
       via  008480bad1251fb9aa726d497d25148a238e7db9 (commit)
       via  5621c2fa857be13ee1f13b4a0178584a8cb783fe (commit)
      from  67f80c3e1ba9987369297a37f26fda680b9f9d6c (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=9df562aee9d17d00549722070d06da6967f7a154
commit 9df562aee9d17d00549722070d06da6967f7a154
Merge: 67f80c3 008480b
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Mar 23 13:12:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 23 13:12:25 2015 -0400

    Merge topic 'xcode5-xctest' into next
    
    008480ba Tests: Enable XCTest tests for Xcode 5
    5621c2fa Look for Xcode 5 platform specific Frameworks


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=008480bad1251fb9aa726d497d25148a238e7db9
commit 008480bad1251fb9aa726d497d25148a238e7db9
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Mar 23 18:06:46 2015 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Mon Mar 23 18:09:52 2015 +0100

    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=5621c2fa857be13ee1f13b4a0178584a8cb783fe
commit 5621c2fa857be13ee1f13b4a0178584a8cb783fe
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Mar 20 23:48:22 2015 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Mon Mar 23 18:09:24 2015 +0100

    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 OSX ones.
    
    For the record:
    
    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..2cbfce1 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -167,12 +167,21 @@ 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}")
+      message(STATUS "Found")
+      break()
+    endif()
+  endforeach()
 endif()
 list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
   /Library/Frameworks

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

Summary of changes:
 Modules/Platform/Darwin.cmake |   21 +++++++++++++++------
 Tests/CMakeLists.txt          |    2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake