[Cmake-commits] CMake branch, next, updated. v3.6.2-2542-gec9b84d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ec9b84d509dfb3e9b7ea0e7bb358c3fb3d2f722d (commit)
       via  cb8db285595138df513432294d55c1a8364454e5 (commit)
      from  3476af802f745e3f928f60648f699439fb46cf51 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec9b84d509dfb3e9b7ea0e7bb358c3fb3d2f722d
commit ec9b84d509dfb3e9b7ea0e7bb358c3fb3d2f722d
Merge: 3476af8 cb8db28
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 27 08:28:21 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 27 08:28:21 2016 -0400

    Merge topic 'silent-nsis-installs' into next
    
    cb8db285 CPack/NSIS: Fix silent NSIS installs


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb8db285595138df513432294d55c1a8364454e5
commit cb8db285595138df513432294d55c1a8364454e5
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Tue Sep 27 12:19:52 2016 +1000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 27 08:27:24 2016 -0400

    CPack/NSIS: Fix silent NSIS installs
    
    The installer should not put up a message box to confirm uninstall of a
    previous version for silent installs. Furthermore, when the uninstaller
    is invoked, do not show its confirmation dialog because either (a) the
    installer already asked the user or (b) the installer is running in
    silent mode.
    
    Closes: #16328

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:

-----------------------------------------------------------------------

Summary of changes:
 Modules/NSIS.template.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake