diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-17 20:55:42 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-11-17 20:55:42 (GMT) |
| commit | 8b2839e41028211515ada624d06ebf78c5858472 (patch) | |
| tree | f84916fda6fdbfe95f4d898fb605e1fd75c6c49f | |
| parent | 0e5bde9aed9c84d2e0b3911e75f82f240d07e27b (diff) | |
| download | CMake-8b2839e41028211515ada624d06ebf78c5858472.zip CMake-8b2839e41028211515ada624d06ebf78c5858472.tar.gz CMake-8b2839e41028211515ada624d06ebf78c5858472.tar.bz2 | |
ENH: move fix for replace of @var@ in cmake files from main tree and a better message for cpack and nsis
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
2 files changed, 6 insertions, 2 deletions
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 @@ int cmCPackNSISGenerator::InitializeInternal() 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 @@ void cmMakefile::ExpandArguments( 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. |