diff options
| author | Juan Ramos <juan.ramos@kitware.com> | 2024-04-29 18:02:11 (GMT) |
|---|---|---|
| committer | Juan Ramos <juan.ramos@kitware.com> | 2024-04-29 21:46:05 (GMT) |
| commit | abd1b02dfa6cffef8b6564011353849f20e7dfdc (patch) | |
| tree | a83994a7bb0cbfcba3889e1d9d0439f2d0ea8fcc /Tests/Architecture | |
| parent | a4b7a13c23479a2893027eae18c5ac90f6cca8f7 (diff) | |
| download | CMake-abd1b02dfa6cffef8b6564011353849f20e7dfdc.zip CMake-abd1b02dfa6cffef8b6564011353849f20e7dfdc.tar.gz CMake-abd1b02dfa6cffef8b6564011353849f20e7dfdc.tar.bz2 | |
Tests/Architecture: Have test support Xcode 10+
Diffstat (limited to 'Tests/Architecture')
| -rw-r--r-- | Tests/Architecture/CMakeLists.txt | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/Tests/Architecture/CMakeLists.txt b/Tests/Architecture/CMakeLists.txt index 3d10ee0..8b3d0af 100644 --- a/Tests/Architecture/CMakeLists.txt +++ b/Tests/Architecture/CMakeLists.txt @@ -1,30 +1,21 @@ cmake_minimum_required(VERSION 3.5) project(Architecture C) -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("${rv}" STREQUAL "0" AND ov MATCHES "^Xcode ([0-9]+)\\.") - if(NOT CMAKE_MATCH_1 VERSION_LESS 4) - set(${result_var} 1 PARENT_SCOPE) - endif() - endif() - endif() -endfunction() - -test_for_xcode4(is_xcode4) - -set(arch0 i386) -set(arch1 ppc) - -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 12) + # Since Xcode 12 we have two architectures again: arm64 and x86_64. + set(arch0 x86_64) + set(arch1 arm64) +elseif(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 10) + # Xcode 10 / 11 do not have two supported architectures for the host. + message(STATUS "Skip test x86_64 only") + return() +elseif(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 4) + # Xcode 4 no longer supports ppc, but does support x86_64. set(arch0 i386) set(arch1 x86_64) +else() + set(arch0 i386) + set(arch1 ppc) endif() add_library(foo foo.c) @@ -43,7 +34,6 @@ if(CMAKE_OSX_ARCHITECTURES) endif() endif() -message("is_xcode4='${is_xcode4}'") message("archs='${archs}'") message("arch0='${arch0}'") message("arch1='${arch1}'") |