diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-22 13:26:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-22 13:27:23 (GMT) |
| commit | 63600a8ca641563dae8c4a6f19b365392d6a0ed4 (patch) | |
| tree | 2ce6a31f008a6d793e9ae421bad68a43e58726ab | |
| parent | 312d0ccb6b97813e170ad8a82ce100cc35f11532 (diff) | |
| parent | 6b8c99a1e36c17a3f2f921122e659ef3831668b7 (diff) | |
| download | CMake-63600a8ca641563dae8c4a6f19b365392d6a0ed4.zip CMake-63600a8ca641563dae8c4a6f19b365392d6a0ed4.tar.gz CMake-63600a8ca641563dae8c4a6f19b365392d6a0ed4.tar.bz2 | |
Merge topic 'test-BuildDepends-no-rosetta' into release-3.29
6b8c99a1e3 Tests: Fix BuildDepends on macOS arm64 without rosetta
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9277
| -rw-r--r-- | Tests/BuildDepends/Project/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt index 7fddf4b..a320d53 100644 --- a/Tests/BuildDepends/Project/CMakeLists.txt +++ b/Tests/BuildDepends/Project/CMakeLists.txt @@ -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) |