diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-28 13:50:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-28 13:51:00 (GMT) |
| commit | c58ec3209bbd117f8b5078f0e188d15d98cdd3fb (patch) | |
| tree | b411f03ce5ead0deb5665eebb3a71c22098f2bad | |
| parent | 11530e5504395c753fa23ce2b6c702c2d7e60602 (diff) | |
| parent | 79f48da5c23dd8335cc36f3f7d7b3b7d36c82dd2 (diff) | |
| download | CMake-c58ec3209bbd117f8b5078f0e188d15d98cdd3fb.zip CMake-c58ec3209bbd117f8b5078f0e188d15d98cdd3fb.tar.gz CMake-c58ec3209bbd117f8b5078f0e188d15d98cdd3fb.tar.bz2 | |
Merge topic 'cpack-nsis-uninstall-name'
79f48da5c2 CPack/NSIS: Fix CPACK_NSIS_UNINSTALL_NAME when not Uninstall.exe
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6050
| -rw-r--r-- | Modules/Internal/CPack/NSIS.template.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Internal/CPack/NSIS.template.in b/Modules/Internal/CPack/NSIS.template.in index e6439ad..0a9c487 100644 --- a/Modules/Internal/CPack/NSIS.template.in +++ b/Modules/Internal/CPack/NSIS.template.in @@ -919,8 +919,8 @@ Function .onInit ;Run the uninstaller uninst: ClearErrors - StrLen $2 "\Uninstall.exe" - StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path + StrLen $2 "\@CPACK_NSIS_UNINSTALL_NAME@.exe" + StrCpy $3 $0 -$2 # remove "\@CPACK_NSIS_UNINSTALL_NAME@.exe" from UninstallString to get path ExecWait '"$0" /S _?=$3' ;Do not copy the uninstaller to a temp file IfErrors uninst_failed inst |