[Cmake-commits] [cmake-commits] david.cole committed cmCPackNSISGenerator.cxx 1.37 1.38

[cmake-commits at cmake.org]

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

Modified Files:
	cmCPackNSISGenerator.cxx 
Log Message:
BUG: Fix issue #7800. Enable CPack to find the NSIS installer on Windows 2000.


Index: cmCPackNSISGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackNSISGenerator.cxx,v
retrieving revision 1.37
retrieving revision 1.38
diff -C 2 -d -r1.37 -r1.38
*** cmCPackNSISGenerator.cxx	1 Oct 2008 13:04:27 -0000	1.37
--- cmCPackNSISGenerator.cxx	10 Oct 2008 21:08:00 -0000	1.38
***************
*** 349,359 ****
        cmsys::SystemTools::KeyWOW64_32) )
      {
!     cmCPackLogger
!       (cmCPackLog::LOG_ERROR, 
!        "Cannot find NSIS registry value. This is usually caused by NSIS "
!        "not being installed. Please install NSIS from "
!        "http://nsis.sourceforge.net"
!        << std::endl);
!     return 0;
      }
    path.push_back(nsisPath);
--- 349,363 ----
        cmsys::SystemTools::KeyWOW64_32) )
      {
!     if ( !cmsys::SystemTools::ReadRegistryValue(
!         "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath) )
!       {
!       cmCPackLogger
!         (cmCPackLog::LOG_ERROR,
!          "Cannot find NSIS registry value. This is usually caused by NSIS "
!          "not being installed. Please install NSIS from "
!          "http://nsis.sourceforge.net"
!          << std::endl);
!       return 0;
!       }
      }
    path.push_back(nsisPath);