kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Do not expand escape sequences when re-expanding variables in include directories, link directories, and link libraries.

Browse Source
This commit is contained in:
Brad King 2005-11-22 17:03:07 -05:00
parent 130d469dd4
commit 102dd34bdc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
View File

@ -1289,17 +1289,17 @@ void cmMakefile::ExpandVariables()
for(std::vector<std::string>::iterator d = m_IncludeDirectories.begin(); for(std::vector<std::string>::iterator d = m_IncludeDirectories.begin();
d != m_IncludeDirectories.end(); ++d) d != m_IncludeDirectories.end(); ++d)
{ {
this->ExpandVariablesInString(*d); this->ExpandVariablesInString(*d, true, true);
} }
for(std::vector<std::string>::iterator d = m_LinkDirectories.begin(); for(std::vector<std::string>::iterator d = m_LinkDirectories.begin();
d != m_LinkDirectories.end(); ++d) d != m_LinkDirectories.end(); ++d)
{ {
this->ExpandVariablesInString(*d); this->ExpandVariablesInString(*d, true, true);
} }
for(cmTarget::LinkLibraries::iterator l = m_LinkLibraries.begin(); for(cmTarget::LinkLibraries::iterator l = m_LinkLibraries.begin();
l != m_LinkLibraries.end(); ++l) l != m_LinkLibraries.end(); ++l)
{ {
this->ExpandVariablesInString(l->first); this->ExpandVariablesInString(l->first, true, true);
} }
} }

2
Source/cmTarget.cxx
View File

@ -240,7 +240,7 @@ void cmTarget::GenerateSourceFilesFromSourceLists( cmMakefile &mf)
LinkLibraries::iterator p = m_LinkLibraries.begin(); LinkLibraries::iterator p = m_LinkLibraries.begin();
for (;p != m_LinkLibraries.end(); ++p) for (;p != m_LinkLibraries.end(); ++p)
{ {
mf.ExpandVariablesInString(p->first); mf.ExpandVariablesInString(p->first, true, true);
} }
} }