diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-18 18:01:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-03-18 18:01:26 (GMT) |
| commit | fce0617408add95d184c573714960a5b6020bde1 (patch) | |
| tree | 7e47338b2e9b0797b654a1263123122426fea8bb /Tests | |
| parent | 07fea85ab9d87d47458fc8e670386299f486e74d (diff) | |
| parent | cb1b2dc664a21e0792afadba51f1c566db90ff37 (diff) | |
| download | CMake-fce0617408add95d184c573714960a5b6020bde1.zip CMake-fce0617408add95d184c573714960a5b6020bde1.tar.gz CMake-fce0617408add95d184c573714960a5b6020bde1.tar.bz2 | |
Merge topic 'ci-wix'
cb1b2dc664 ci: Provide WiX 3 in PATH of jobs that need it
b71b6300e5 ci: Provide WiX 3 in versioned location
694f14f96f Tests: Teach CPackWiXGenerator to use WiX tools in PATH
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9342
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake b/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake index c549e61..28665ee 100644 --- a/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake +++ b/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake @@ -39,9 +39,8 @@ endif() function(run_wix_command command) file(TO_CMAKE_PATH "$ENV{WIX}" WIX_ROOT) - set(WIX_PROGRAM "${WIX_ROOT}/bin/${command}.exe") - - if(NOT EXISTS "${WIX_PROGRAM}") + find_program(WIX_PROGRAM NAMES ${command} NO_CACHE PATHS "${WIX_ROOT}" PATH_SUFFIXES "bin") + if(NOT WIX_PROGRAM) message(FATAL_ERROR "Failed to find WiX Tool: ${WIX_PROGRAM}") endif() |