diff options
| author | David Cole <david.cole@kitware.com> | 2012-04-25 18:06:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-04-25 18:06:29 (GMT) |
| commit | 419f561b2f554b0fd92482c79ba49be0e3f7875e (patch) | |
| tree | 82ec3cee8349065ad79bd664d73844d2f2680cf1 | |
| parent | 4b4a98d72298e892b17aa0d14462bab7836a7c1d (diff) | |
| parent | fe58b67e24d007cb7dcd7005073a37bfba21737d (diff) | |
| download | CMake-419f561b2f554b0fd92482c79ba49be0e3f7875e.zip CMake-419f561b2f554b0fd92482c79ba49be0e3f7875e.tar.gz CMake-419f561b2f554b0fd92482c79ba49be0e3f7875e.tar.bz2 | |
Merge topic 'fix-9946-uninstall-before-install'
fe58b67 Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL
| -rw-r--r-- | Modules/CPack.cmake | 4 | ||||
| -rw-r--r-- | Modules/CPackNSIS.cmake | 8 | ||||
| -rw-r--r-- | Modules/NSIS.template.in | 22 |
3 files changed, 34 insertions, 0 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 1b2fa61..e572119 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -342,6 +342,10 @@ cpack_set_if_not_set(CPACK_RESOURCE_FILE_WELCOME cpack_set_if_not_set(CPACK_MODULE_PATH "${CMAKE_MODULE_PATH}") +IF(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL) + SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) +ENDIF(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL) + IF(CPACK_NSIS_MODIFY_PATH) SET(CPACK_NSIS_MODIFY_PATH ON) ENDIF(CPACK_NSIS_MODIFY_PATH) diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake index 66c33a8..d140053 100644 --- a/Modules/CPackNSIS.cmake +++ b/Modules/CPackNSIS.cmake @@ -54,6 +54,14 @@ ##end # ##variable +# CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL - Ask about uninstalling +# previous versions first. +# If this is set to "ON", then an installer will look for previous +# installed versions and if one is found, ask the user whether to +# uninstall it before proceeding with the install. +##end +# +##variable # CPACK_NSIS_MODIFY_PATH - Modify PATH toggle. # If this is set to "ON", then an extra page # will appear in the installer that will allow the user to choose diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index e7edead..43f72f6 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -900,6 +900,28 @@ SectionEnd ; "Program Files" for AllUsers, "My Documents" for JustMe... Function .onInit + StrCmp "@CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL@" "ON" 0 inst + + ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "UninstallString" + StrCmp $0 "" inst + + MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION \ + "@CPACK_NSIS_PACKAGE_NAME@ is already installed. $\n$\nDo you want to uninstall the old version before installing the new one?" \ + IDYES uninst IDNO inst + Abort + +;Run the uninstaller +uninst: + ClearErrors + ExecWait '$0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file + + IfErrors uninst_failed inst +uninst_failed: + MessageBox MB_OK|MB_ICONSTOP "Uninstall failed." + Abort + + +inst: ; Reads components status for registry !insertmacro SectionList "InitSection" |