diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-07 20:14:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-11 16:23:18 (GMT) |
| commit | b024732b1970e0121a058b4b671caae573ab1dd6 (patch) | |
| tree | 42e17bcf82f0dec0ce53d031c183154eeba13ea3 /.gitlab/ci | |
| parent | bb261818f4a3374589694ebaf964a41321d876dc (diff) | |
| download | CMake-b024732b1970e0121a058b4b671caae573ab1dd6.zip CMake-b024732b1970e0121a058b4b671caae573ab1dd6.tar.gz CMake-b024732b1970e0121a058b4b671caae573ab1dd6.tar.bz2 | |
ci: Explicitly enable CPackWiXGenerator test only in specific jobs
Drop the environment-based heuristic.
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake b/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake index e7d76f3..be9ce12 100644 --- a/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake +++ b/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake @@ -3,6 +3,7 @@ set(CMake_TEST_GUI "OFF" CACHE BOOL "") set(BUILD_QtDialog "OFF" CACHE BOOL "") set(CMAKE_PREFIX_PATH "" CACHE STRING "") +set(CMake_TEST_CPACK_WIX "ON" CACHE BOOL "") set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") set(CMake_TEST_TLS_VERSION "1.2" CACHE STRING "") diff --git a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake index e224a58..c32c8e2 100644 --- a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake @@ -3,6 +3,8 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") set(CMake_TEST_ISPC "ON" CACHE STRING "") set(CMake_TEST_Swift "ON" CACHE STRING "") endif() + +set(CMake_TEST_CPACK_WIX "ON" CACHE BOOL "") set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "") set(CMake_TEST_TLS_VERSION "1.2" CACHE STRING "") |