Merge topic 'xcode9-ios-tests'

d210b281 Xcode: Adjust tests to drop of 32bit iOS architectures

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1347

Tests/RunCMake/XcodeProject/RunCMakeTest.cmake

@@ -129,7 +129,9 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
   unset(RunCMake_TEST_BINARY_DIR)
   unset(RunCMake_TEST_NO_CLEAN)
   unset(RunCMake_TEST_OPTIONS)
+endif()
 
+if(XCODE_VERSION VERSION_GREATER_EQUAL 6 AND XCODE_VERSION VERSION_LESS 9)
   # XcodeIOSInstallCombinedPrune
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeIOSInstallCombinedPrune-build)
   set(RunCMake_TEST_NO_CLEAN 1)

Tests/RunCMake/XcodeProject/XcodeBundles.cmake

@@ -5,7 +5,11 @@ enable_language(C)
 
 if(TEST_IOS)
   set(CMAKE_OSX_SYSROOT iphoneos)
-  set(CMAKE_OSX_ARCHITECTURES "armv7")
+  if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
+    set(CMAKE_OSX_ARCHITECTURES "arm64")
+  else()
+    set(CMAKE_OSX_ARCHITECTURES "armv7")
+  endif()
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 endif(TEST_IOS)

Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake

@@ -13,7 +13,11 @@ function(verify_architectures file)
   string(REPLACE "architecture " "" actual "${architectures}")
   list(SORT actual)
 
-  set(expected arm64 armv7 i386 x86_64)
+  if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
+    set(expected arm64 x86_64)
+  else()
+    set(expected arm64 armv7 i386 x86_64)
+  endif()
 
   if(NOT actual STREQUAL expected)
     message(SEND_ERROR

Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake

@@ -7,7 +7,11 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 
-set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64")
+if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+else()
+    set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64")
+endif()
 
 add_executable(foo_app MACOSX_BUNDLE main.cpp)
 install(TARGETS foo_app BUNDLE DESTINATION bin)

Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake

@@ -6,7 +6,11 @@ set(CMAKE_OSX_SYSROOT iphoneos)
 set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
 
-set(CMAKE_OSX_ARCHITECTURES "armv7;i386")
+if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
+  set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+else()
+  set(CMAKE_OSX_ARCHITECTURES "armv7;i386")
+endif()
 
 add_library(foo STATIC foo.cpp)
 install(TARGETS foo ARCHIVE DESTINATION lib)