From b796749ba839a3401f42fcee0774d4cbb9e7a043 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 15 Jan 2020 14:30:57 -0500 Subject: 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. --- Tests/CPackNSISGenerator/RunCPackVerifyResult.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}'") -- cgit v0.12