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 <[email protected]>
Merge-request: !1338

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

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")