ENH: move fix for replace of @var@ in cmake files from main tree and a better message for cpack and nsis
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 1b54701..f48ecc3 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -147,7 +147,11 @@
if ( !cmsys::SystemTools::ReadRegistryValue(
"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);
return 0;
}
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 72b2151..ff5b759 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2060,7 +2060,7 @@
value = i->Value;
this->ExpandVariablesInString(value, false, false, false,
i->FilePath, i->Line,
- false, false);
+ false, true);
// If the argument is quoted, it should be one argument.
// Otherwise, it may be a list of arguments.
