diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-05 13:49:57 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-05 09:50:03 -0400 |
| commit | f7d29c0b9aae2ee250b1dc3dd3bc903cce2011b4 (patch) | |
| tree | ab93d69c5a3fb8ac8bc6ccf1dfd33f55c678fd2c | |
| parent | 4ffa4ddd8078918583fc03302fa3c3db2c1ca733 (diff) | |
| parent | d210b2813072c874ee13fcc941e41aacacf09874 (diff) | |
| download | cmake-f7d29c0b9aae2ee250b1dc3dd3bc903cce2011b4.tar.gz | |
Merge topic 'xcode9-ios-tests'
d210b281 Xcode: Adjust tests to drop of 32bit iOS architectures
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1347
5 files changed, 22 insertions, 4 deletions
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index 5f4bdc30dd..554aa2f312 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/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) diff --git a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake index 0b854d80a4..cee71fabc1 100644 --- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake +++ b/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) diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake index a1c06718f2..cd712051df 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake +++ b/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 diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake index fc830b19e2..6abba49a99 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake +++ b/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) diff --git a/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake b/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake index a797410695..f629f2e275 100644 --- a/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake +++ b/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) |