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

fix for expaning libraries prior to generating dsp

Browse Source
This commit is contained in:
Ken Martin 2001-05-10 15:32:49 -04:00
parent 978407e042
commit a15ae83e95
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmTarget.cxx
View File

@ -66,6 +66,13 @@ void cmTarget::GenerateSourceFilesFromSourceLists(const cmMakefile &mf)
m_SourceFiles.push_back(file); m_SourceFiles.push_back(file);
} }
} }
// expand any link library variables whle we are at it
LinkLibraries::iterator p = m_LinkLibraries.begin();
for (;p != m_LinkLibraries.end(); ++p)
{
mf.ExpandVariablesInString(p->first);
}
} }
void cmTarget::MergeLibraries(const LinkLibraries &ll) void cmTarget::MergeLibraries(const LinkLibraries &ll)
@ -75,10 +82,11 @@ void cmTarget::MergeLibraries(const LinkLibraries &ll)
LinkLibraries::const_iterator p = ll.begin(); LinkLibraries::const_iterator p = ll.begin();
for (;p != ll.end(); ++p) for (;p != ll.end(); ++p)
{ {
if (std::find(m_LinkLibraries.begin(),m_LinkLibraries.end(),*p) == m_LinkLibraries.end()) if (std::find(m_LinkLibraries.begin(),m_LinkLibraries.end(),*p) == m_LinkLibraries.end())
{ {
m_LinkLibraries.push_back(*p); m_LinkLibraries.push_back(*p);
} }
} }
} }