kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'osx-framework-search-platform-SDKs' 

0ee2a004 OS X: Add platform-specific Frameworks search path
This commit is contained in:
Brad King 2015-02-24 09:12:45 -05:00 committed by CMake Topic Stage
parent 13f9f848de 0ee2a004e7
commit 41a16f07c3
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/Platform/Darwin.cmake
View File

@ -166,6 +166,13 @@ if(_CMAKE_OSX_SYSROOT_PATH)
${_CMAKE_OSX_SYSROOT_PATH}/Network/Library/Frameworks ${_CMAKE_OSX_SYSROOT_PATH}/Network/Library/Frameworks
${_CMAKE_OSX_SYSROOT_PATH}/System/Library/Frameworks ${_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()
endif() endif()
list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
/Library/Frameworks /Library/Frameworks

2
Tests/RunCMake/CMakeLists.txt
View File

@ -184,7 +184,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio [^6]")
endif() endif()
if(XCODE_VERSION AND NOT "${XCODE_VERSION}" VERSION_LESS 3) if(XCODE_VERSION AND NOT "${XCODE_VERSION}" VERSION_LESS 3)
add_RunCMake_test(XcodeProject) add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION})
endif() endif()
add_RunCMake_test(File_Generate) add_RunCMake_test(File_Generate)

3
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
View File

@ -3,3 +3,6 @@ include(RunCMake)
run_cmake(XcodeFileType) run_cmake(XcodeFileType)
run_cmake(XcodeAttributeGenex) run_cmake(XcodeAttributeGenex)
run_cmake(XcodeAttributeGenexError) run_cmake(XcodeAttributeGenexError)
if (NOT XCODE_VERSION VERSION_LESS 6)
run_cmake(XcodePlatformFrameworks)
endif()

6
Tests/RunCMake/XcodeProject/XcodePlatformFrameworks.cmake Normal file
View File

@ -0,0 +1,6 @@
enable_language(C)
find_library(XCTEST_LIBRARY XCTest)
if(NOT XCTEST_LIBRARY)
message(FATAL_ERROR "XCTest Framework not found.")
endif()