diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2017-10-08 19:17:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-10 13:08:44 (GMT) |
| commit | 78a560e42bc475ff3fbebd8baa1f12ea0f3ea172 (patch) | |
| tree | 7bb15f3abb79e6153d012498bb5dc720c4feb42f | |
| parent | d210b2813072c874ee13fcc941e41aacacf09874 (diff) | |
| download | CMake-78a560e42bc475ff3fbebd8baa1f12ea0f3ea172.zip CMake-78a560e42bc475ff3fbebd8baa1f12ea0f3ea172.tar.gz CMake-78a560e42bc475ff3fbebd8baa1f12ea0f3ea172.tar.bz2 | |
Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"
This reverts commit d210b2813072c874ee13fcc941e41aacacf09874.
5 files changed, 4 insertions, 22 deletions
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index 554aa2f..5f4bdc3 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -129,9 +129,7 @@ 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 cee71fa..0b854d8 100644 --- a/Tests/RunCMake/XcodeProject/XcodeBundles.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeBundles.cmake @@ -5,11 +5,7 @@ enable_language(C) if(TEST_IOS) set(CMAKE_OSX_SYSROOT iphoneos) - if(XCODE_VERSION VERSION_GREATER_EQUAL 9) - set(CMAKE_OSX_ARCHITECTURES "arm64") - else() - set(CMAKE_OSX_ARCHITECTURES "armv7") - endif() + set(CMAKE_OSX_ARCHITECTURES "armv7") 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 cd71205..a1c0671 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake @@ -13,11 +13,7 @@ function(verify_architectures file) string(REPLACE "architecture " "" actual "${architectures}") list(SORT actual) - if(XCODE_VERSION VERSION_GREATER_EQUAL 9) - set(expected arm64 x86_64) - else() - set(expected arm64 armv7 i386 x86_64) - endif() + set(expected arm64 armv7 i386 x86_64) if(NOT actual STREQUAL expected) message(SEND_ERROR diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake index 6abba49..fc830b1 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake @@ -7,11 +7,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") -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() +set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64") 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 f629f2e..a797410 100644 --- a/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake @@ -6,11 +6,7 @@ set(CMAKE_OSX_SYSROOT iphoneos) set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") -if(XCODE_VERSION VERSION_GREATER_EQUAL 9) - set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") -else() - set(CMAKE_OSX_ARCHITECTURES "armv7;i386") -endif() +set(CMAKE_OSX_ARCHITECTURES "armv7;i386") add_library(foo STATIC foo.cpp) install(TARGETS foo ARCHIVE DESTINATION lib) |