Commit 78a560e4 authored by Gregor Jasny's avatar Gregor Jasny Committed by Brad King
Browse files

Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"

This reverts commit d210b281.
parent d210b281
...@@ -129,9 +129,7 @@ if(NOT XCODE_VERSION VERSION_LESS 6) ...@@ -129,9 +129,7 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
unset(RunCMake_TEST_BINARY_DIR) unset(RunCMake_TEST_BINARY_DIR)
unset(RunCMake_TEST_NO_CLEAN) unset(RunCMake_TEST_NO_CLEAN)
unset(RunCMake_TEST_OPTIONS) unset(RunCMake_TEST_OPTIONS)
endif()
if(XCODE_VERSION VERSION_GREATER_EQUAL 6 AND XCODE_VERSION VERSION_LESS 9)
# XcodeIOSInstallCombinedPrune # XcodeIOSInstallCombinedPrune
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeIOSInstallCombinedPrune-build) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeIOSInstallCombinedPrune-build)
set(RunCMake_TEST_NO_CLEAN 1) set(RunCMake_TEST_NO_CLEAN 1)
......
...@@ -5,11 +5,7 @@ enable_language(C) ...@@ -5,11 +5,7 @@ enable_language(C)
if(TEST_IOS) if(TEST_IOS)
set(CMAKE_OSX_SYSROOT iphoneos) set(CMAKE_OSX_SYSROOT iphoneos)
if(XCODE_VERSION VERSION_GREATER_EQUAL 9) set(CMAKE_OSX_ARCHITECTURES "armv7")
set(CMAKE_OSX_ARCHITECTURES "arm64")
else()
set(CMAKE_OSX_ARCHITECTURES "armv7")
endif()
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
endif(TEST_IOS) endif(TEST_IOS)
......
...@@ -13,11 +13,7 @@ function(verify_architectures file) ...@@ -13,11 +13,7 @@ function(verify_architectures file)
string(REPLACE "architecture " "" actual "${architectures}") string(REPLACE "architecture " "" actual "${architectures}")
list(SORT actual) list(SORT actual)
if(XCODE_VERSION VERSION_GREATER_EQUAL 9) set(expected arm64 armv7 i386 x86_64)
set(expected arm64 x86_64)
else()
set(expected arm64 armv7 i386 x86_64)
endif()
if(NOT actual STREQUAL expected) if(NOT actual STREQUAL expected)
message(SEND_ERROR message(SEND_ERROR
......
...@@ -7,11 +7,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") ...@@ -7,11 +7,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
if(XCODE_VERSION VERSION_GREATER_EQUAL 9) set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64")
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) add_executable(foo_app MACOSX_BUNDLE main.cpp)
install(TARGETS foo_app BUNDLE DESTINATION bin) install(TARGETS foo_app BUNDLE DESTINATION bin)
......
...@@ -6,11 +6,7 @@ set(CMAKE_OSX_SYSROOT iphoneos) ...@@ -6,11 +6,7 @@ set(CMAKE_OSX_SYSROOT iphoneos)
set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
if(XCODE_VERSION VERSION_GREATER_EQUAL 9) set(CMAKE_OSX_ARCHITECTURES "armv7;i386")
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
else()
set(CMAKE_OSX_ARCHITECTURES "armv7;i386")
endif()
add_library(foo STATIC foo.cpp) add_library(foo STATIC foo.cpp)
install(TARGETS foo ARCHIVE DESTINATION lib) install(TARGETS foo ARCHIVE DESTINATION lib)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment