diff options
author | Brad King <brad.king@kitware.com> | 2020-12-10 11:57:49 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-10 11:57:54 (GMT) |
commit | 419adf0eef5888639a95465459ff8297e414fae0 (patch) | |
tree | af527d6818ef4b7e1299b8e5e0ca9a0568789cb8 /.gitlab | |
parent | ea77dbcaf874a64d0aba0f36c7404fc26dc87deb (diff) | |
parent | 55193c8013fbdf9a9bb211bb27833007a189a44c (diff) | |
download | CMake-419adf0eef5888639a95465459ff8297e414fae0.zip CMake-419adf0eef5888639a95465459ff8297e414fae0.tar.gz CMake-419adf0eef5888639a95465459ff8297e414fae0.tar.bz2 |
Merge topic 'test-macos-version'
55193c8013 ci: Hard-code XCTest deployment target to 10.15
40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3
c404d7f221 Tests: Add cache entry to control XCTest deployment target
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5593
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/configure_macos_common.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake index 4bd3c7d..37cd51c 100644 --- a/.gitlab/ci/configure_macos_common.cmake +++ b/.gitlab/ci/configure_macos_common.cmake @@ -11,3 +11,8 @@ set(CMake_TEST_Java 0 CACHE FILEPATH "") set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF CACHE BOOL "") set(BUILD_QtDialog ON CACHE BOOL "") + +# The "XCTest" test uses an explicit deployment target chosen +# 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 "") |