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 | |
| 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.
| -rw-r--r-- | .gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 10 |
3 files changed, 4 insertions, 9 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 "") diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 42f8563..52aba53 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -978,16 +978,8 @@ if(BUILD_TESTING) endif() endif() - # On Windows run the CPackWiXGenerator test - # if the WiX Toolset seems to be available if(WIN32) - file(TO_CMAKE_PATH "$ENV{WIX}" WIX_ROOT) - - find_program(WIX_LIGHT_EXECUTABLE light - PATHS "${WIX_ROOT}/bin" - DOC "WiX Toolset light.exe location") - - if(WIX_LIGHT_EXECUTABLE) + if(CMake_TEST_CPACK_WIX) add_test(CPackWiXGenerator ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} --build-and-test |