mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 17:19:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Pass path to WiX 3 into RunCMake.CPack_WIX test

Browse Source 
Avoid requiring its location to be in the PATH environment variable.
This commit is contained in:
Brad King
2024-03-19 19:00:02 -04:00
parent 69a2eeb9df
commit eb403bb7b4
7 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake
+1 -1
View File
@@ -3,9 +3,9 @@ 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 "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_cxx_modules_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_wix_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common_ninja.cmake")
.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake
+1 -1
View File
@@ -4,9 +4,9 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
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 "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_cxx_modules_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_wix_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common_ninja.cmake")
.gitlab/ci/configure_windows_wix_common.cmake
+2
View File
@@ -0,0 +1,2 @@
get_filename_component(wix3_dir "${CMAKE_CURRENT_LIST_DIR}/../wix3" ABSOLUTE)
set(CMake_TEST_CPACK_WIX3 "${wix3_dir}" CACHE PATH "")
.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1
+1 -1
View File
@@ -1 +1 @@
. .gitlab/ci/wix3-env.ps1
& "$pwsh" -File .gitlab/ci/wix3.ps1
.gitlab/ci/env_windows_vs2022_x64_ninja.ps1
+1 -1
View File
@@ -4,4 +4,4 @@ if ("$env:CMAKE_CI_NIGHTLY" -eq "true") {
. ".gitlab/ci/swift-env.ps1"
}
. .gitlab/ci/wix3-env.ps1
& "$pwsh" -File .gitlab/ci/wix3.ps1
Tests/RunCMake/CMakeLists.txt
+4 -2
View File
@@ -1097,8 +1097,10 @@ endif()
add_RunCMake_test_group(CPack "${cpack_tests}")
if(CMake_TEST_CPACK_WIX)
add_RunCMake_test(CPack_WIX)
if(CMake_TEST_CPACK_WIX3)
add_RunCMake_test(CPack_WIX
-DCMake_TEST_CPACK_WIX3=${CMake_TEST_CPACK_WIX3}
)
endif()
# add a test to make sure symbols are exported from a shared library
Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake
+2
View File
@@ -2,4 +2,6 @@ include(RunCPack)
set(RunCPack_GENERATORS WIX)
set(ENV{PATH} "${CMake_TEST_CPACK_WIX3};$ENV{PATH}")
run_cpack(AppWiX BUILD GLOB *.msi VERIFY powershell -ExecutionPolicy Bypass -File ${CMAKE_CURRENT_LIST_DIR}/print-msi.ps1)