diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-18 17:38:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-05-18 17:41:31 (GMT) |
| commit | 21df34b25526225d04f9f5e6351c13e68425e195 (patch) | |
| tree | d7f5812b168ced0c19ce220672fd31b450ffa5f6 /.gitlab | |
| parent | 4d5c32fa2cd0170617d1ab489b17ec7fee87b89d (diff) | |
| download | CMake-21df34b25526225d04f9f5e6351c13e68425e195.zip CMake-21df34b25526225d04f9f5e6351c13e68425e195.tar.gz CMake-21df34b25526225d04f9f5e6351c13e68425e195.tar.bz2 | |
Tests: Modernize name of option to control existence of BootstrapTest
Diffstat (limited to '.gitlab')
| -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 "") |