mirror of
https://github.com/Kitware/CMake.git
synced 2025-12-31 10:50:16 -06:00
ci: Explicitly enable CPackWiXGenerator test only in specific jobs
Drop the environment-based heuristic.
This commit is contained in:
@@ -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 "")
|
||||
|
||||
|
||||
@@ -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 "")
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user