Commit 8b2839e4 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: move fix for replace of @var@ in cmake files from main tree and a better...

ENH: move fix for replace of @var@ in cmake files from main tree and a better message for cpack and nsis
parent 0e5bde9a
...@@ -147,7 +147,11 @@ int cmCPackNSISGenerator::InitializeInternal() ...@@ -147,7 +147,11 @@ int cmCPackNSISGenerator::InitializeInternal()
if ( !cmsys::SystemTools::ReadRegistryValue( if ( !cmsys::SystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath) ) "HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find NSIS registry value" 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.org"
<< std::endl); << std::endl);
return 0; return 0;
} }
......
...@@ -2060,7 +2060,7 @@ void cmMakefile::ExpandArguments( ...@@ -2060,7 +2060,7 @@ void cmMakefile::ExpandArguments(
value = i->Value; value = i->Value;
this->ExpandVariablesInString(value, false, false, false, this->ExpandVariablesInString(value, false, false, false,
i->FilePath, i->Line, i->FilePath, i->Line,
false, false); false, true);
// If the argument is quoted, it should be one argument. // If the argument is quoted, it should be one argument.
// Otherwise, it may be a list of arguments. // Otherwise, it may be a list of arguments.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment