[Cmake-commits] CMake branch, next, updated. v2.8.9-1115-gd195793

[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  d1957937fd9fb6af60acdb696ccb7ad001a42aa1 (commit)
       via  668dda034f9dac763e3af745f5ca810d17d4a9a3 (commit)
      from  bbcbc26135ddaf38a8572f2dc7117011d86e1bf8 (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=d1957937fd9fb6af60acdb696ccb7ad001a42aa1
commit d1957937fd9fb6af60acdb696ccb7ad001a42aa1
Merge: bbcbc26 668dda0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Oct 17 14:28:53 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 17 14:28:53 2012 -0400

    Merge topic 'fix-9629-add-unicode-nsis-reg-key' into next
    
    668dda0 CPack: Add automatic detection of the Unicode makensis (#9629)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=668dda034f9dac763e3af745f5ca810d17d4a9a3
commit 668dda034f9dac763e3af745f5ca810d17d4a9a3
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Oct 16 19:45:16 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Oct 17 13:45:18 2012 -0400

    CPack: Add automatic detection of the Unicode makensis (#9629)

diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index b2e57a2..fdbae35 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -356,18 +356,30 @@ int cmCPackNSISGenerator::InitializeInternal()
     << std::endl);
   std::vector<std::string> path;
   std::string nsisPath;
-  bool gotRegValue = true;
+  bool gotRegValue = false;
 
 #ifdef _WIN32
-  if ( !cmsys::SystemTools::ReadRegistryValue(
+  if ( !gotRegValue && cmsys::SystemTools::ReadRegistryValue(
+      "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS\\Unicode", nsisPath,
+      cmsys::SystemTools::KeyWOW64_32) )
+    {
+    gotRegValue = true;
+    }
+  if ( !gotRegValue && cmsys::SystemTools::ReadRegistryValue(
+      "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS\\Unicode", nsisPath) )
+    {
+    gotRegValue = true;
+    }
+  if ( !gotRegValue && cmsys::SystemTools::ReadRegistryValue(
       "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath,
       cmsys::SystemTools::KeyWOW64_32) )
     {
-    if ( !cmsys::SystemTools::ReadRegistryValue(
-        "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath) )
-      {
-      gotRegValue = false;
-      }
+    gotRegValue = true;
+    }
+  if ( !gotRegValue && cmsys::SystemTools::ReadRegistryValue(
+      "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath) )
+    {
+    gotRegValue = true;
     }
 
   if (gotRegValue)

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

Summary of changes:
 Source/CPack/cmCPackNSISGenerator.cxx |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake