diff options
| author | Brad King <brad.king@kitware.com> | 2024-06-05 17:40:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-06-05 18:01:14 (GMT) |
| commit | 614100dbf66b44bafd618acaf752b1c2877ce9bc (patch) | |
| tree | d280330ed0e4a51ce4ed1d6d51ba2ff7c5b78c26 /Modules/Internal | |
| parent | c370593f2e41b2094d6d7f1a1c47cd5d9d371388 (diff) | |
| download | CMake-614100dbf66b44bafd618acaf752b1c2877ce9bc.zip CMake-614100dbf66b44bafd618acaf752b1c2877ce9bc.tar.gz CMake-614100dbf66b44bafd618acaf752b1c2877ce9bc.tar.bz2 | |
CPack/WiX: Restore default (missing) InstallScope from 3.28 and lower
In commit 60661f6770 (CPack/WiX: Make InstallScope configurable,
2023-11-07, v3.29.0-rc1~413^2) the `CPACK_WIX_INSTALL_SCOPE` default was
set to `perMachine`. While installers created with `perMachine` have
better behavior on their own than installers created without any
`InstallScope`, they do not cleanly convert existing installations on
updates.
Fixes: #26029
Diffstat (limited to 'Modules/Internal')
| -rw-r--r-- | Modules/Internal/CPack/CPackWIX.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Modules/Internal/CPack/CPackWIX.cmake b/Modules/Internal/CPack/CPackWIX.cmake index 103d21c..9980bc2 100644 --- a/Modules/Internal/CPack/CPackWIX.cmake +++ b/Modules/Internal/CPack/CPackWIX.cmake @@ -11,6 +11,10 @@ if(CPACK_WIX_VERSION VERSION_GREATER_EQUAL 4) if(NOT CPACK_WIX_EXECUTABLE) message(FATAL_ERROR "Could not find the 'wix' executable.") endif() + + if(NOT DEFINED CPACK_WIX_INSTALL_SCOPE) + set(CPACK_WIX_INSTALL_SCOPE "perMachine") + endif() else() find_program(CPACK_WIX_CANDLE_EXECUTABLE candle PATHS "${CPACK_WIX_ROOT}" PATH_SUFFIXES "bin") @@ -23,8 +27,8 @@ else() if(NOT CPACK_WIX_LIGHT_EXECUTABLE) message(FATAL_ERROR "Could not find the WiX light executable.") endif() -endif() -if(NOT DEFINED CPACK_WIX_INSTALL_SCOPE) - set(CPACK_WIX_INSTALL_SCOPE "perMachine") + if(NOT DEFINED CPACK_WIX_INSTALL_SCOPE) + set(CPACK_WIX_INSTALL_SCOPE "NONE") + endif() endif() |