diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-28 12:04:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-28 12:04:58 (GMT) |
| commit | cd89d1998a3312887536451485609e8ab09181ef (patch) | |
| tree | 1750ff83f60865dca808432332600a9e9669213f /Modules | |
| parent | 9a9b9d445a81aa24fa5ceccca5eaf7fdf151b5e3 (diff) | |
| parent | cb8db285595138df513432294d55c1a8364454e5 (diff) | |
| download | CMake-cd89d1998a3312887536451485609e8ab09181ef.zip CMake-cd89d1998a3312887536451485609e8ab09181ef.tar.gz CMake-cd89d1998a3312887536451485609e8ab09181ef.tar.bz2 | |
Merge topic 'silent-nsis-installs'
cb8db285 CPack/NSIS: Fix silent NSIS installs
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/NSIS.template.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index c66a89b..9001888 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -905,7 +905,7 @@ Function .onInit 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 + /SD IDYES IDYES uninst IDNO inst Abort ;Run the uninstaller @@ -913,7 +913,7 @@ uninst: ClearErrors 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 + ExecWait '"$0" /S _?=$3' ;Do not copy the uninstaller to a temp file IfErrors uninst_failed inst uninst_failed: |