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

ENH: Moved link library related code from GenerateSourceFilesFromSourceLists to AnalyzeLibDependencies to make the former do no more than what its name says.

This commit is contained in:
Brad King 2007-05-28 12:05:28 -04:00
parent 06472d620a
commit 3d822e3a25
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmTarget.cxx
View File

@ -694,16 +694,8 @@ void cmTarget::GenerateSourceFilesFromSourceLists( cmMakefile &mf)
this->SourceFiles.push_back(mf.AddSource(file)); this->SourceFiles.push_back(mf.AddSource(file));
} }
} }
// expand any link library variables whle we are at it
LinkLibraryVectorType::iterator p = this->LinkLibraries.begin();
for (;p != this->LinkLibraries.end(); ++p)
{
mf.ExpandVariablesInString(p->first, true, true);
}
} }
void cmTarget::MergeLinkLibraries( cmMakefile& mf, void cmTarget::MergeLinkLibraries( cmMakefile& mf,
const char *selfname, const char *selfname,
const LinkLibraryVectorType& libs ) const LinkLibraryVectorType& libs )
@ -977,6 +969,19 @@ cmTarget::AnalyzeLibDependencies( const cmMakefile& mf )
// cyclic dependencies, so this is probably not a big deal. Note that // cyclic dependencies, so this is probably not a big deal. Note that
// the link line is always correct, just not necessary optimal. // the link line is always correct, just not necessary optimal.
{
// Expand variables in link library names. This is for backwards
// compatibility with very early CMake versions and should
// eventually be removed. This code was moved here from the end of
// old source list processing code which was called just before this
// method.
for(LinkLibraryVectorType::iterator p = this->LinkLibraries.begin();
p != this->LinkLibraries.end(); ++p)
{
this->Makefile->ExpandVariablesInString(p->first, true, true);
}
}
typedef std::vector< std::string > LinkLine; typedef std::vector< std::string > LinkLine;
// The dependency map. // The dependency map.