summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-11-22 22:03:07 (GMT)
committerBrad King <brad.king@kitware.com>2005-11-22 22:03:07 (GMT)
commit102dd34bdc78f5e95eb416050831637cd4cde2a4 (patch)
tree350493d5c62547a8ba29e2d94b3d07783f881212 /Source/cmMakefile.cxx
parent130d469dd4e66d2cb9b24f60887564f0df355f34 (diff)
downloadCMake-102dd34bdc78f5e95eb416050831637cd4cde2a4.zip
CMake-102dd34bdc78f5e95eb416050831637cd4cde2a4.tar.gz
CMake-102dd34bdc78f5e95eb416050831637cd4cde2a4.tar.bz2
BUG: Do not expand escape sequences when re-expanding variables in include directories, link directories, and link libraries.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index dcab4cb..200533d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1289,17 +1289,17 @@ void cmMakefile::ExpandVariables()
for(std::vector<std::string>::iterator d = m_IncludeDirectories.begin();
d != m_IncludeDirectories.end(); ++d)
{
- this->ExpandVariablesInString(*d);
+ this->ExpandVariablesInString(*d, true, true);
}
for(std::vector<std::string>::iterator d = m_LinkDirectories.begin();
d != m_LinkDirectories.end(); ++d)
{
- this->ExpandVariablesInString(*d);
+ this->ExpandVariablesInString(*d, true, true);
}
for(cmTarget::LinkLibraries::iterator l = m_LinkLibraries.begin();
l != m_LinkLibraries.end(); ++l)
{
- this->ExpandVariablesInString(l->first);
+ this->ExpandVariablesInString(l->first, true, true);
}
}