diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-03 13:09:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-03 13:09:08 (GMT) |
| commit | 58d9297eefd516cb30c00f132a9c9b8c440c4f91 (patch) | |
| tree | 74f5fea2e6f24a38de82ea84077b82eb991ab4d3 | |
| parent | b8dd7a705c5e3149a86208f027e3d15703389494 (diff) | |
| download | CMake-58d9297eefd516cb30c00f132a9c9b8c440c4f91.zip CMake-58d9297eefd516cb30c00f132a9c9b8c440c4f91.tar.gz CMake-58d9297eefd516cb30c00f132a9c9b8c440c4f91.tar.bz2 | |
Tests: Fix RunCMake.Framework ios arch for Xcode 9
Xcode 9 comes with the iPhoneOS 11.0 SDK that does not support the
`armv7` architecture. For this SDK version and newer, use `arm64`.
| -rw-r--r-- | Tests/RunCMake/Framework/ios.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Tests/RunCMake/Framework/ios.cmake b/Tests/RunCMake/Framework/ios.cmake index 209a50d..446e914 100644 --- a/Tests/RunCMake/Framework/ios.cmake +++ b/Tests/RunCMake/Framework/ios.cmake @@ -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") |