[Cmake-commits] CMake branch, next, updated. v2.8.9-1102-g96d3377

[David Cole]

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  96d3377e3f15374adbe4141187cd8d037bb93683 (commit)
       via  12c092cf67b39e8519b3672afad05fdc5d8f1d5c (commit)
      from  52ae0e305096b888cc2bcb61ef849a1e5414a671 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96d3377e3f15374adbe4141187cd8d037bb93683
commit 96d3377e3f15374adbe4141187cd8d037bb93683
Merge: 52ae0e3 12c092c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Oct 16 07:57:24 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 16 07:57:24 2012 -0400

    Merge topic 'fix-13578-wrong-reg-key' into next
    
    12c092c NSIS: Fix incorrect uninstall registry key name (#13578)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12c092cf67b39e8519b3672afad05fdc5d8f1d5c
commit 12c092cf67b39e8519b3672afad05fdc5d8f1d5c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Oct 15 09:58:10 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Oct 16 07:53:59 2012 -0400

    NSIS: Fix incorrect uninstall registry key name (#13578)
    
    Thanks to Alexander for the bug report.

diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 9e8a6d9..ffc425e 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -902,7 +902,7 @@ SectionEnd
 Function .onInit
   StrCmp "@CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL@" "ON" 0 inst
 
-  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "UninstallString"
+  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "UninstallString"
   StrCmp $0 "" inst
 
   MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION \

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

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


hooks/post-receive
-- 
CMake