From a44a2d2579bd8fb3e27bc2957a1c3efec4158d42 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 10 Mar 2025 17:02:33 -0400 Subject: [PATCH] ci: Explicitly enable or disable RunCMake.AppleSilicon test in macos jobs Enable it on `macos-arm64` jobs and disable it on `macos-x86_64` jobs. Since the default detection pierces Rosetta, it cannot be used in CI where we might build and test on different hosts. --- .gitlab/ci/configure_macos_common.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake index e78c9cec33..614f211149 100644 --- a/.gitlab/ci/configure_macos_common.cmake +++ b/.gitlab/ci/configure_macos_common.cmake @@ -16,3 +16,9 @@ set(BUILD_QtDialog ON CACHE BOOL "") # when CMake itself is configured. Use a version that is not # newer than the macOS version running on any CI host. set(CMake_TEST_XCTest_DEPLOYMENT_TARGET "10.15" CACHE STRING "") + +if("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos_arm64") + set(CMake_TEST_APPLE_SILICON ON CACHE BOOL "") +else() + set(CMake_TEST_APPLE_SILICON OFF CACHE BOOL "") +endif()