reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-12 23:19:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'test-macos-updates'

Browse Source 
58d9297e Tests: Fix RunCMake.Framework ios arch for Xcode 9
b8dd7a70 Tests: Fix RunCMake.Framework expected output on macOS 10.13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1338
This commit is contained in:
Brad King 2017-10-04 11:07:06 +00:00 committed by Kitware Robot
commit 1e38b99454
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt
View File

@ -1,2 +1,2 @@
.*/Framework:( Mach-O universal binary with [^
]*)? current ar archive random library.*
/Framework: (Mach-O universal binary with [^
]*)?current ar archive random library

12
Tests/RunCMake/Framework/ios.cmake
View File

@ -20,6 +20,16 @@ execute_process(
OUTPUT_VARIABLE IOS_SDK_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(
COMMAND ${XCRUN_EXECUTABLE} --sdk iphoneos --show-sdk-version
OUTPUT_VARIABLE IOS_SDK_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(IOS_SDK_VERSION VERSION_GREATER_EQUAL 11.0)
set(IOS_ARCH arm64)
else()
set(IOS_ARCH armv7)
endif()
set(CMAKE_OSX_SYSROOT ${IOS_SDK_PATH} CACHE PATH "Sysroot used for iOS support")
set(CMAKE_OSX_ARCHITECTURES "armv7" CACHE STRING "Architectures to build for")
set(CMAKE_OSX_ARCHITECTURES "${IOS_ARCH}" CACHE STRING "Architectures to build for")
set(CMAKE_FIND_ROOT_PATH ${IOS_SDK_PATH} CACHE PATH "Find search path root")