[Cmake-commits] [cmake-commits] david.cole committed cmCPackNSISGenerator.cxx 1.34 1.35

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv16749

Modified Files:
	cmCPackNSISGenerator.cxx 
Log Message:
BUG: Always look for the NSIS reg value in the 32-bit hive even in 64-bit builds of CPack.


Index: cmCPackNSISGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackNSISGenerator.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -C 2 -d -r1.34 -r1.35
*** cmCPackNSISGenerator.cxx	17 Jun 2008 18:07:15 -0000	1.34
--- cmCPackNSISGenerator.cxx	18 Jun 2008 18:25:57 -0000	1.35
***************
*** 309,313 ****
  #ifdef _WIN32
    if ( !cmsys::SystemTools::ReadRegistryValue(
!       "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath) )
      {
      cmCPackLogger
--- 309,314 ----
  #ifdef _WIN32
    if ( !cmsys::SystemTools::ReadRegistryValue(
!       "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath,
!       cmsys::SystemTools::KeyWOW64_32) )
      {
      cmCPackLogger