kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix issue #7800. Enable CPack to find the NSIS installer on Windows 2000.

This commit is contained in:
David Cole 2008-10-10 17:08:00 -04:00
parent 5a82a0b108
commit c3976b0283
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CPack/cmCPackNSISGenerator.cxx
View File

@ -348,6 +348,9 @@ int cmCPackNSISGenerator::InitializeInternal()
"HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath, "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath,
cmsys::SystemTools::KeyWOW64_32) ) cmsys::SystemTools::KeyWOW64_32) )
{ {
if ( !cmsys::SystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath) )
{
cmCPackLogger cmCPackLogger
(cmCPackLog::LOG_ERROR, (cmCPackLog::LOG_ERROR,
"Cannot find NSIS registry value. This is usually caused by NSIS " "Cannot find NSIS registry value. This is usually caused by NSIS "
@ -356,6 +359,7 @@ int cmCPackNSISGenerator::InitializeInternal()
<< std::endl); << std::endl);
return 0; return 0;
} }
}
path.push_back(nsisPath); path.push_back(nsisPath);
#endif #endif
nsisPath = cmSystemTools::FindProgram("makensis", path, false); nsisPath = cmSystemTools::FindProgram("makensis", path, false);