diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-16 15:40:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-16 15:40:56 (GMT) |
| commit | 2a850232fcaac1523d3433b5a8850c6b1770b380 (patch) | |
| tree | af213acc14fdaaea4f4901c56b84ef60c5659aee | |
| parent | 05738b5f21c95c83dbd25bfb4e8bfc1be5be713a (diff) | |
| parent | b796749ba839a3401f42fcee0774d4cbb9e7a043 (diff) | |
| download | CMake-2a850232fcaac1523d3433b5a8850c6b1770b380.zip CMake-2a850232fcaac1523d3433b5a8850c6b1770b380.tar.gz CMake-2a850232fcaac1523d3433b5a8850c6b1770b380.tar.bz2 | |
Merge topic 'cpack-nsis-test'
b796749ba8 Tests: Fix CPackNSISGenerator test on non-x86 Windows platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4230
| -rw-r--r-- | Tests/CPackNSISGenerator/RunCPackVerifyResult.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CPackNSISGenerator/RunCPackVerifyResult.cmake b/Tests/CPackNSISGenerator/RunCPackVerifyResult.cmake index f70cd24..01b37c5 100644 --- a/Tests/CPackNSISGenerator/RunCPackVerifyResult.cmake +++ b/Tests/CPackNSISGenerator/RunCPackVerifyResult.cmake @@ -27,7 +27,7 @@ else () message(STATUS "CPack_output=${CPack_output}") endif() -set(expected_file_mask "${CPackNSISGenerator_BINARY_DIR}/_CPack_Packages/win32/NSIS/*.nsi") +set(expected_file_mask "${CPackNSISGenerator_BINARY_DIR}/_CPack_Packages/*/NSIS/*.nsi") file(GLOB project_file "${expected_file_mask}") message(STATUS "project_file='${project_file}'") |