diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-19 16:55:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-11-19 16:55:30 (GMT) |
| commit | aea838cf417cf124fd089a97f28d1af2e77e27d4 (patch) | |
| tree | d7cc97f92f665abe6676393fdca439bf21887c59 /Modules | |
| parent | f33810b567ff403e3a37735e3ed6d8d40fd86360 (diff) | |
| parent | 60661f67701d890b6c8200261953d01b66462158 (diff) | |
| download | CMake-aea838cf417cf124fd089a97f28d1af2e77e27d4.zip CMake-aea838cf417cf124fd089a97f28d1af2e77e27d4.tar.gz CMake-aea838cf417cf124fd089a97f28d1af2e77e27d4.tar.bz2 | |
Merge topic 'cpack-wix-installscope'
60661f6770 CPack/WiX: Make InstallScope configurable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8954
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Internal/CPack/CPackWIX.cmake | 4 | ||||
| -rw-r--r-- | Modules/Internal/CPack/WIX.template.in | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Modules/Internal/CPack/CPackWIX.cmake b/Modules/Internal/CPack/CPackWIX.cmake index d1875f2..5fe772e 100644 --- a/Modules/Internal/CPack/CPackWIX.cmake +++ b/Modules/Internal/CPack/CPackWIX.cmake @@ -18,3 +18,7 @@ find_program(CPACK_WIX_LIGHT_EXECUTABLE light if(NOT CPACK_WIX_LIGHT_EXECUTABLE) message(FATAL_ERROR "Could not find the WiX light executable.") endif() + +if(NOT DEFINED CPACK_WIX_INSTALL_SCOPE) + set(CPACK_WIX_INSTALL_SCOPE "perMachine") +endif() diff --git a/Modules/Internal/CPack/WIX.template.in b/Modules/Internal/CPack/WIX.template.in index c0bf935..fdd8278 100644 --- a/Modules/Internal/CPack/WIX.template.in +++ b/Modules/Internal/CPack/WIX.template.in @@ -12,7 +12,12 @@ Manufacturer="$(var.CPACK_PACKAGE_VENDOR)" UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)"> + + <?if $(var.CPACK_WIX_INSTALL_SCOPE) = "NONE" ?> <Package InstallerVersion="301" Compressed="yes"/> + <?else?> + <Package InstallerVersion="301" Compressed="yes" InstallScope="$(var.CPACK_WIX_INSTALL_SCOPE)"/> + <?endif?> <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/> |