fix for expaning libraries prior to generating dsp
This commit is contained in:
parent
978407e042
commit
a15ae83e95
|
@ -66,6 +66,13 @@ void cmTarget::GenerateSourceFilesFromSourceLists(const cmMakefile &mf)
|
|||
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)
|
||||
|
@ -75,10 +82,11 @@ void cmTarget::MergeLibraries(const LinkLibraries &ll)
|
|||
LinkLibraries::const_iterator p = ll.begin();
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue