diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-15 19:30:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-01-15 19:33:37 (GMT) |
| commit | b796749ba839a3401f42fcee0774d4cbb9e7a043 (patch) | |
| tree | 8523d3a94d267b541f382a8d5c5fb36692cc269d | |
| parent | 9f1ce93d92ec33e879ef593de021d0b577de6c68 (diff) | |
| download | CMake-b796749ba839a3401f42fcee0774d4cbb9e7a043.zip CMake-b796749ba839a3401f42fcee0774d4cbb9e7a043.tar.gz CMake-b796749ba839a3401f42fcee0774d4cbb9e7a043.tar.bz2 | |
Tests: Fix CPackNSISGenerator test on non-x86 Windows platforms
In commit ebfffc609e (CPack/NSIS: Add option for setting
MUI_HEADERIMAGE_BITMAP, 2020-01-02) this test was added but only globbed
for 32-bit windows packages. Fix the test to glob for packages of any
architecture.
| -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}'") |