mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-30 18:29:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit d210b28130.
This commit is contained in:
Gregor Jasny
2017-10-08 21:17:41 +02:00
committed by Brad King
parent d210b28130
commit 78a560e42b
5 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
View File

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

6
Tests/RunCMake/XcodeProject/XcodeBundles.cmake
View File

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

6
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake
View File

@@ -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

6
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake
View File

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

6
Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake
View File

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