Commit 1e38b994 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'test-macos-updates'

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's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1338
parents 44d0e377 58d9297e
.*/Framework:( Mach-O universal binary with [^
]*)? current ar archive random library.*
/Framework: (Mach-O universal binary with [^
]*)?current ar archive random library
......@@ -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")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment