From b8dd7a705c5e3149a86208f027e3d15703389494 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 3 Oct 2017 09:05:13 -0400 Subject: Tests: Fix RunCMake.Framework expected output on macOS 10.13 The archiver output in the case of universal binaries has changed slightly. Update our expected output to match. While at it, drop unnecessary leading and trailing `.*`. --- Tests/RunCMake/Framework/FrameworkTypeSTATIC-build-stdout.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v0.12 From 58d9297eefd516cb30c00f132a9c9b8c440c4f91 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 3 Oct 2017 09:09:08 -0400 Subject: 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`. --- Tests/RunCMake/Framework/ios.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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") -- cgit v0.12