diff options
Diffstat (limited to 'Tests/CPackWiXGenerator')
| -rw-r--r-- | Tests/CPackWiXGenerator/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Tests/CPackWiXGenerator/CMakeLists.txt b/Tests/CPackWiXGenerator/CMakeLists.txt index 73eaf4f..940e849 100644 --- a/Tests/CPackWiXGenerator/CMakeLists.txt +++ b/Tests/CPackWiXGenerator/CMakeLists.txt @@ -49,6 +49,9 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example") set(CPACK_WIX_UPGRADE_GUID "BF20CE5E-7F7C-401D-8F7C-AB45E8D170E6") set(CPACK_WIX_UNINSTALL "1") +# Support non-interactive sessions (like CI). +set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-sval") + set(CPACK_PACKAGE_EXECUTABLES "my-libapp" "CPack WiX Test" "my-other-app" "Second CPack WiX Test" diff --git a/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake b/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake index ca9fd90..c549e61 100644 --- a/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake +++ b/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake @@ -74,4 +74,6 @@ endforeach() # error SMOK1076 : ICE61: This product should remove only older # versions of itself. The Maximum version is not less # than the current product. (1.0.0 1.0.0) -run_wix_command(smoke -nologo -wx -sw1076 "${installer_file}") +if (NOT no_verify) + run_wix_command(smoke -nologo -wx -sw1076 "${installer_file}") +endif () |