ci: Explicitly enable CPackWiXGenerator test only in specific jobs

Drop the environment-based heuristic.
This commit is contained in:
Brad King
2024-03-07 15:14:29 -05:00
parent bb261818f4
commit b024732b19
3 changed files with 4 additions and 9 deletions

View File

@@ -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 "")

View File

@@ -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 "")

View File

@@ -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