diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-19 12:46:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-19 12:46:23 (GMT) |
| commit | f1438379c2c919671d64c60f657b78962a1eedc9 (patch) | |
| tree | 7ea3170c191c5654f899b3a51960ebba7e9165da /.gitlab/ci | |
| parent | 9939f606a69c105772091e0c880ab8a8bfe31a97 (diff) | |
| parent | 80181da866329ce2f202a7129a49fb02f38e3902 (diff) | |
| download | CMake-f1438379c2c919671d64c60f657b78962a1eedc9.zip CMake-f1438379c2c919671d64c60f657b78962a1eedc9.tar.gz CMake-f1438379c2c919671d64c60f657b78962a1eedc9.tar.bz2 | |
Merge topic 'test-bootstrap'
80181da866 Tests: Add option to control timeout of BootstrapTest
21df34b255 Tests: Modernize name of option to control existence of BootstrapTest
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8491
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_common.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_extdeps_common.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_package_common.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_package_common.cmake | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/configure_common.cmake b/.gitlab/ci/configure_common.cmake index ed3d18d..c207a74 100644 --- a/.gitlab/ci/configure_common.cmake +++ b/.gitlab/ci/configure_common.cmake @@ -2,7 +2,7 @@ if("$ENV{CMAKE_CI_BOOTSTRAP}") # Launchers do not work during bootstrap: no ctest available. set(CTEST_USE_LAUNCHERS "OFF" CACHE BOOL "") # We configure by bootstrapping, so skip the BootstrapTest. - set(CMAKE_SKIP_BOOTSTRAP_TEST ON CACHE BOOL "") + set(CMake_TEST_BOOTSTRAP OFF CACHE BOOL "") else() set(CTEST_USE_LAUNCHERS "ON" CACHE BOOL "") endif() diff --git a/.gitlab/ci/configure_extdeps_common.cmake b/.gitlab/ci/configure_extdeps_common.cmake index 2c7d328..c06592c 100644 --- a/.gitlab/ci/configure_extdeps_common.cmake +++ b/.gitlab/ci/configure_extdeps_common.cmake @@ -1,5 +1,5 @@ set(CMAKE_USE_SYSTEM_LIBRARIES ON CACHE BOOL "") -set(CMAKE_SKIP_BOOTSTRAP_TEST ON CACHE BOOL "") +set(CMake_TEST_BOOTSTRAP OFF CACHE BOOL "") set(CMake_TEST_Qt6 OFF CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_package_common.cmake b/.gitlab/ci/configure_macos_package_common.cmake index 3aa8ae2..8aab41b 100644 --- a/.gitlab/ci/configure_macos_package_common.cmake +++ b/.gitlab/ci/configure_macos_package_common.cmake @@ -10,12 +10,12 @@ set(CMAKE_CXX_FLAGS "-stdlib=libc++" CACHE STRING "") set(CMAKE_C_STANDARD "11" CACHE STRING "") set(CMAKE_CXX_STANDARD "14" CACHE STRING "") set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "") -set(CMAKE_SKIP_BOOTSTRAP_TEST "TRUE" CACHE STRING "") set(BUILD_CursesDialog "ON" CACHE BOOL "") set(BUILD_QtDialog "TRUE" CACHE BOOL "") set(CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL "3" CACHE STRING "") set(CMake_INSTALL_DEPENDENCIES "ON" CACHE BOOL "") set(CMAKE_SKIP_RPATH "TRUE" CACHE BOOL "") +set(CMake_TEST_BOOTSTRAP OFF CACHE BOOL "") set(CMake_TEST_NO_FindPackageModeMakefileTest "TRUE" CACHE BOOL "") # XXX(sccache): restore sccache when it works for multiple architectures: diff --git a/.gitlab/ci/configure_windows_package_common.cmake b/.gitlab/ci/configure_windows_package_common.cmake index b3929a4..541a541 100644 --- a/.gitlab/ci/configure_windows_package_common.cmake +++ b/.gitlab/ci/configure_windows_package_common.cmake @@ -13,7 +13,7 @@ set(CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL "3" CACHE STRING "") # Disable ccmake. set(BUILD_CursesDialog "OFF" CACHE BOOL "") -set(CMAKE_SKIP_BOOTSTRAP_TEST "TRUE" CACHE STRING "") +set(CMake_TEST_BOOTSTRAP OFF CACHE BOOL "") set(CMake_TEST_Java OFF CACHE BOOL "") set(CMake_TEST_Qt5 OFF CACHE BOOL "") set(CMake_TEST_Qt6 OFF CACHE BOOL "") |