Merge topic 'test-BuildDepends-no-rosetta' into release-3.29

6b8c99a1e3 Tests: Fix BuildDepends on macOS arm64 without rosetta

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9277

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)