diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-28 14:05:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-28 14:06:40 (GMT) |
| commit | f289ab61e36b94b9b718aa22b55b79b882df7b93 (patch) | |
| tree | 7bb2cab0857b12f90c86714de904386cb8c001ba /Modules | |
| parent | cb13aa580d918816538e76efb666f1209f0dd717 (diff) | |
| parent | c97abc96882caab6cba49f6ab1b00ceb88b5a757 (diff) | |
| download | CMake-f289ab61e36b94b9b718aa22b55b79b882df7b93.zip CMake-f289ab61e36b94b9b718aa22b55b79b882df7b93.tar.gz CMake-f289ab61e36b94b9b718aa22b55b79b882df7b93.tar.bz2 | |
Merge topic 'cpack-nsis-uninstaller-name'
c97abc9688 CPack/NSIS: Add option for custom Uninstall filename
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3945
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPack.cmake | 2 | ||||
| -rw-r--r-- | Modules/Internal/CPack/NSIS.template.in | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 1809846..c912a0a 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -688,6 +688,8 @@ endif() # value of CPACK_NSIS_PACKAGE_NAME instead # of CPACK_PACKAGE_INSTALL_DIRECTORY _cpack_set_default(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}") +# Specify the name of the Uninstall file in NSIS +_cpack_set_default(CPACK_NSIS_UNINSTALL_NAME "Uninstall") if(CPACK_NSIS_DISPLAY_NAME_SET) _cpack_set_default(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_DISPLAY_NAME}") diff --git a/Modules/Internal/CPack/NSIS.template.in b/Modules/Internal/CPack/NSIS.template.in index f75ae78..c1db769 100644 --- a/Modules/Internal/CPack/NSIS.template.in +++ b/Modules/Internal/CPack/NSIS.template.in @@ -642,7 +642,7 @@ Section "-Core installation" WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR ;Create uninstaller - WriteUninstaller "$INSTDIR\Uninstall.exe" + WriteUninstaller "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe" Push "DisplayName" Push "@CPACK_NSIS_DISPLAY_NAME@" Call ConditionalAddToRegisty @@ -653,7 +653,7 @@ Section "-Core installation" Push "@CPACK_PACKAGE_VENDOR@" Call ConditionalAddToRegisty Push "UninstallString" - Push "$INSTDIR\Uninstall.exe" + Push "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe" Call ConditionalAddToRegisty Push "NoRepair" Push "1" @@ -690,7 +690,7 @@ Section "-Core installation" CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" @CPACK_NSIS_CREATE_ICONS@ @CPACK_NSIS_CREATE_ICONS_EXTRA@ - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" + CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe" ;Read a value from an InstallOptions INI file !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State" @@ -829,7 +829,7 @@ Section "Uninstall" !endif ;Remove the uninstaller itself. - Delete "$INSTDIR\Uninstall.exe" + Delete "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe" DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" ;Remove the installation directory if it is empty. |