diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-19 23:00:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-19 23:46:07 (GMT) |
| commit | eb403bb7b42ddb59c8621997400c37787d753708 (patch) | |
| tree | 8c9b68d90ccd44027a047616ec315558692827fe /.gitlab/ci | |
| parent | 69a2eeb9dff5b60f2f1e5b425002a0fd45b7cadb (diff) | |
| download | CMake-eb403bb7b42ddb59c8621997400c37787d753708.zip CMake-eb403bb7b42ddb59c8621997400c37787d753708.tar.gz CMake-eb403bb7b42ddb59c8621997400c37787d753708.tar.bz2 | |
Tests: Pass path to WiX 3 into RunCMake.CPack_WIX test
Avoid requiring its location to be in the PATH environment variable.
Diffstat (limited to '.gitlab/ci')
5 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake b/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake index be9ce12..cd9780b 100644 --- a/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake +++ b/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake @@ -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") diff --git a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake index c32c8e2..7321e10 100644 --- a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake @@ -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") diff --git a/.gitlab/ci/configure_windows_wix_common.cmake b/.gitlab/ci/configure_windows_wix_common.cmake new file mode 100644 index 0000000..faf2464 --- /dev/null +++ b/.gitlab/ci/configure_windows_wix_common.cmake @@ -0,0 +1,2 @@ +get_filename_component(wix3_dir "${CMAKE_CURRENT_LIST_DIR}/../wix3" ABSOLUTE) +set(CMake_TEST_CPACK_WIX3 "${wix3_dir}" CACHE PATH "") diff --git a/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 b/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 index a898007..b0085d2 100755 --- a/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 +++ b/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 @@ -1 +1 @@ -. .gitlab/ci/wix3-env.ps1 +& "$pwsh" -File .gitlab/ci/wix3.ps1 diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 index 0649b9f..9dde3a2 100755 --- a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 @@ -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 |