From c3976b0283c0594a2f1979585c03f0354b418511 Mon Sep 17 00:00:00 2001
From: David Cole <david.cole@kitware.com>
Date: Fri, 10 Oct 2008 17:08:00 -0400
Subject: BUG: Fix issue #7800. Enable CPack to find the NSIS installer on
Windows 2000.
---
Source/CPack/cmCPackNSISGenerator.cxx | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 3072419..460ede9 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -348,13 +348,17 @@ int cmCPackNSISGenerator::InitializeInternal()
"HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath,
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;
+ 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);
#endif
--
cgit v0.12