diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-24 15:26:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-24 15:26:21 (GMT) |
| commit | ed777f18375b79694016550b1221b2ed63c997a5 (patch) | |
| tree | 569007a73995817f1c04538c011e087046345607 | |
| parent | bcdda24851c83c86c19ec9cd96c90e7cdec688ef (diff) | |
| parent | 6ab1413499284dc8e1d7a8ac1f1940798a79e674 (diff) | |
| download | CMake-ed777f18375b79694016550b1221b2ed63c997a5.zip CMake-ed777f18375b79694016550b1221b2ed63c997a5.tar.gz CMake-ed777f18375b79694016550b1221b2ed63c997a5.tar.bz2 | |
Merge topic 'xcode5-xctest'
6ab14134 Tests: Enable XCTest tests for Xcode 5
52642b46 OS X: Look for Xcode 5 platform-specific Frameworks
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 20 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
2 files changed, 15 insertions, 7 deletions
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 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) |