dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-07-12 10:34:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Do not use i386 architecture with Xcode 10 and above

Browse Source 
Xcode 10 dropped support for i386 builds.
This commit is contained in:
Brad King
2018-06-19 11:12:50 -04:00
parent 71fa78ff7a
commit ca69206893
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Tests/BuildDepends/Project/CMakeLists.txt
View File

@@ -1,30 +1,30 @@
cmake_minimum_required(VERSION 2.6)
project(testRebuild)
function(test_for_xcode4 result_var)
set(${result_var} 0 PARENT_SCOPE)
if(APPLE)
execute_process(COMMAND xcodebuild -version
OUTPUT_VARIABLE ov RESULT_VARIABLE rv
if(APPLE)
set(CMake_TEST_XCODE_VERSION 0)
if(XCODE_VERSION)
set(CMake_TEST_XCODE_VERSION "${XCODE_VERSION}")
else()
execute_process(
COMMAND xcodebuild -version
OUTPUT_VARIABLE _version ERROR_VARIABLE _version
)
if("${rv}" STREQUAL "0" AND ov MATCHES "^Xcode ([0-9]+)\\.")
if(NOT CMAKE_MATCH_1 VERSION_LESS 4)
set(${result_var} 1 PARENT_SCOPE)
endif()
if(_version MATCHES "^Xcode ([0-9]+(\\.[0-9]+)*)")
set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}")
endif()
endif()
endfunction()
if(APPLE)
# only use multi-arch if the sysroot exists on this machine
# Ninja needs -M which could not be used with multiple -arch flags
if(EXISTS "${CMAKE_OSX_SYSROOT}" AND NOT "${CMAKE_GENERATOR}" MATCHES "Ninja")
set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
test_for_xcode4(is_xcode4)
if(is_xcode4)
# Xcode 4, use modern architectures as defaults
# Arch 'ppc' no longer works: tools no longer available starting with Xcode 4
if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 10)
# Arch 'i386' no longer works in Xcode 10.
set(CMAKE_OSX_ARCHITECTURES x86_64)
elseif(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 4)
# Arch 'ppc' no longer works in Xcode 4.
set(CMAKE_OSX_ARCHITECTURES i386 x86_64)
else()
set(CMAKE_OSX_ARCHITECTURES ppc i386)
endif()
endif()
endif()

4
Tests/CMakeLists.txt
View File

@@ -252,6 +252,10 @@ if(BUILD_TESTING)
set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}")
endif()
endif()
if(NOT CMake_TEST_XCODE_VERSION VERSION_LESS 10)
# Since Xcode 10 we do not have two supported architectures for the host.
set(CTEST_TEST_OSX_ARCH 0)
endif()
if(CMAKE_OSX_SYSROOT)
execute_process(
COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version ProductName