diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-10 13:49:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-10 13:49:33 (GMT) |
| commit | 6bd277d2c15201962c2774d71f326a6918f56231 (patch) | |
| tree | 1809da70b56e0164430cf082e2dcf755e9523d36 /CMakeCPack.cmake | |
| parent | 7540deb185a40ddfbac759f8027df74c2a8569c3 (diff) | |
| parent | a12b0f1b193024b71583b9150aeead33d364d189 (diff) | |
| download | CMake-6bd277d2c15201962c2774d71f326a6918f56231.zip CMake-6bd277d2c15201962c2774d71f326a6918f56231.tar.gz CMake-6bd277d2c15201962c2774d71f326a6918f56231.tar.bz2 | |
Merge topic 'wix-prevent-nsis-overwrite'
a12b0f1b CMake: Prevent WiX installations over existing NSIS installations
Diffstat (limited to 'CMakeCPack.cmake')
| -rw-r--r-- | CMakeCPack.cmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index a0aadcc..3203279 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -198,6 +198,17 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") set(CPACK_WIX_UPGRADE_GUID "8ffd1d72-b7f1-11e2-8ee5-00238bca4991") + if(MSVC AND NOT "$ENV{WIX}" STREQUAL "") + set(WIX_CUSTOM_ACTION_ENABLED TRUE) + if(CMAKE_CONFIGURATION_TYPES) + set(WIX_CUSTOM_ACTION_MULTI_CONFIG TRUE) + else() + set(WIX_CUSTOM_ACTION_MULTI_CONFIG FALSE) + endif() + else() + set(WIX_CUSTOM_ACTION_ENABLED FALSE) + endif() + # Set the options file that needs to be included inside CMakeCPackOptions.cmake set(QT_DIALOG_CPACK_OPTIONS_FILE ${CMake_BINARY_DIR}/Source/QtDialog/QtDialogCPack.cmake) configure_file("${CMake_SOURCE_DIR}/CMakeCPackOptions.cmake.in" |