diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-16 18:37:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-16 18:37:43 (GMT) |
| commit | 831dd5abab9d42c3c23c8087b25402ccea227710 (patch) | |
| tree | 8e61099e1b5805d20cad3c8cfaa67fbee586d2b8 /Modules | |
| parent | 1843f2e0cdba79561d1c4ee2732b3499746cfed3 (diff) | |
| parent | 40566ef2f808cc5bffa5109250f0edf864da5f7e (diff) | |
| download | CMake-831dd5abab9d42c3c23c8087b25402ccea227710.zip CMake-831dd5abab9d42c3c23c8087b25402ccea227710.tar.gz CMake-831dd5abab9d42c3c23c8087b25402ccea227710.tar.bz2 | |
Merge topic 'cpack-nsis-uninstall'
40566ef CPack/NSIS: Obtain path from which to uninstall from registry (#14124)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/NSIS.template.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index 59a444b..76310af 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -916,7 +916,9 @@ Function .onInit ;Run the uninstaller uninst: ClearErrors - ExecWait '$0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file + StrLen $2 "\Uninstall.exe" + StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path + ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file IfErrors uninst_failed inst uninst_failed: |