diff options
| author | Johnny Jazeix <jazeix@gmail.com> | 2019-10-25 10:08:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-25 18:13:25 (GMT) |
| commit | c97abc96882caab6cba49f6ab1b00ceb88b5a757 (patch) | |
| tree | d398c6e8f3e1cac79c112771391989a845578220 /Modules/Internal | |
| parent | 44b5f037e66e58cb4b5f9877b568bc40b9b576ca (diff) | |
| download | CMake-c97abc96882caab6cba49f6ab1b00ceb88b5a757.zip CMake-c97abc96882caab6cba49f6ab1b00ceb88b5a757.tar.gz CMake-c97abc96882caab6cba49f6ab1b00ceb88b5a757.tar.bz2 | |
CPack/NSIS: Add option for custom Uninstall filename
Fixes: #10728
Diffstat (limited to 'Modules/Internal')
| -rw-r--r-- | Modules/Internal/CPack/NSIS.template.in | 8 |
1 files changed, 4 insertions, 4 deletions
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. |