diff options
| author | Brad King <brad.king@kitware.com> | 2006-10-04 18:37:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-10-04 18:37:42 (GMT) |
| commit | 523075ded543cbb7044bc4b56203d329aff0cb42 (patch) | |
| tree | b437035f021967f257018e4199291c5f0983aabf /Source/cmMakefile.cxx | |
| parent | 430f6f35ebfd237e6f33afee21308bfc28a7a553 (diff) | |
| download | CMake-523075ded543cbb7044bc4b56203d329aff0cb42.zip CMake-523075ded543cbb7044bc4b56203d329aff0cb42.tar.gz CMake-523075ded543cbb7044bc4b56203d329aff0cb42.tar.bz2 | |
BUG: Do not replace @VAR@ syntax in list files. This addresses bug #2722.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 29c3bde..52a9127 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1662,7 +1662,8 @@ const char *cmMakefile::ExpandVariablesInString(std::string& source, bool atOnly, const char* filename, long line, - bool removeEmpty) const + bool removeEmpty, + bool replaceAt) const { if ( source.empty() || source.find_first_of("$@\\") == source.npos) { @@ -1681,6 +1682,7 @@ const char *cmMakefile::ExpandVariablesInString(std::string& source, parser.SetLineFile(line, filename); parser.SetEscapeQuotes(escapeQuotes); parser.SetNoEscapeMode(noEscapes); + parser.SetReplaceAtSyntax(replaceAt); int res = parser.ParseString(source.c_str(), 0); if ( res ) { @@ -2022,7 +2024,8 @@ void cmMakefile::ExpandArguments( // Expand the variables in the argument. value = i->Value; this->ExpandVariablesInString(value, false, false, false, - i->FilePath, i->Line); + i->FilePath, i->Line, + false, false); // If the argument is quoted, it should be one argument. // Otherwise, it may be a list of arguments. |