mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-14 04:02:09 +03:00
Code Activity

Merge topic 'test-BuildDepends-no-rosetta'

Browse Source 
6b8c99a1e3 Tests: Fix BuildDepends on macOS arm64 without rosetta

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9277
This commit is contained in:
Brad King authored and Kitware Robot committed 2024-02-22 08:27:24 -05:00
2 parents de239ee461 6b8c99a1e3
commit 3ceacd7432
1 file changed
+3 -1
Download Patch File Download Diff File Expand all files Collapse all files
Tests/BuildDepends/Project/CMakeLists.txt
+3 -1
View File
@@ -17,7 +17,9 @@ 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")
if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 10)
if(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 12)
set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)
elseif(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)