diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-04 11:07:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-04 11:08:27 (GMT) |
| commit | 1e38b99454838660b4727a8ac1f5b611e1d535cc (patch) | |
| tree | c2196162e9aba9507842ba04171857d210cef53c /Tests | |
| parent | 44d0e377f919399a086a62b5df45dd0ede1a2747 (diff) | |
| parent | 58d9297eefd516cb30c00f132a9c9b8c440c4f91 (diff) | |
| download | CMake-1e38b99454838660b4727a8ac1f5b611e1d535cc.zip CMake-1e38b99454838660b4727a8ac1f5b611e1d535cc.tar.gz CMake-1e38b99454838660b4727a8ac1f5b611e1d535cc.tar.bz2 | |
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 <kwrobot@kitware.com>
Merge-request: !1338
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/Framework/ios.cmake | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt index 532cfed..4b5f761 100644 --- a/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt +++ b/Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt @@ -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 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") |