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

Factor implicit link info addition into methods

Browse Source 
In cmComputeLinkInformation::Compute we add implicit link information
from languages other than the linker language to the end of the link
line.  This factors out that code into separate methods to improve
readability and organization.
This commit is contained in:
Brad King 2009-08-24 13:15:47 -04:00
parent 6e7020b452
commit 8aaf3cebeb
2 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Source/cmComputeLinkInformation.cxx
View File

@ -553,6 +553,15 @@ bool cmComputeLinkInformation::Compute()
} }
// Add implicit language runtime libraries and directories. // Add implicit language runtime libraries and directories.
this->AddImplicitLinkInfo();
return true;
}
//----------------------------------------------------------------------------
void cmComputeLinkInformation::AddImplicitLinkInfo()
{
// The link closure lists all languages whose implicit info is needed.
cmTarget::LinkClosure const* lc=this->Target->GetLinkClosure(this->Config); cmTarget::LinkClosure const* lc=this->Target->GetLinkClosure(this->Config);
for(std::vector<std::string>::const_iterator li = lc->Languages.begin(); for(std::vector<std::string>::const_iterator li = lc->Languages.begin();
li != lc->Languages.end(); ++li) li != lc->Languages.end(); ++li)
@ -560,40 +569,44 @@ bool cmComputeLinkInformation::Compute()
// Skip those of the linker language. They are implicit. // Skip those of the linker language. They are implicit.
if(*li != this->LinkLanguage) if(*li != this->LinkLanguage)
{ {
// Add libraries for this language that are not implied by the this->AddImplicitLinkInfo(*li);
// linker language. }
std::string libVar = "CMAKE_"; }
libVar += *li; }
libVar += "_IMPLICIT_LINK_LIBRARIES";
if(const char* libs = this->Makefile->GetDefinition(libVar.c_str()))
{
std::vector<std::string> libsVec;
cmSystemTools::ExpandListArgument(libs, libsVec);
for(std::vector<std::string>::const_iterator i = libsVec.begin();
i != libsVec.end(); ++i)
{
if(this->ImplicitLinkLibs.find(*i) == this->ImplicitLinkLibs.end())
{
this->AddItem(i->c_str(), 0);
}
}
}
// Add linker search paths for this language that are not //----------------------------------------------------------------------------
// implied by the linker language. void cmComputeLinkInformation::AddImplicitLinkInfo(std::string const& lang)
std::string dirVar = "CMAKE_"; {
dirVar += *li; // Add libraries for this language that are not implied by the
dirVar += "_IMPLICIT_LINK_DIRECTORIES"; // linker language.
if(const char* dirs = this->Makefile->GetDefinition(dirVar.c_str())) std::string libVar = "CMAKE_";
libVar += lang;
libVar += "_IMPLICIT_LINK_LIBRARIES";
if(const char* libs = this->Makefile->GetDefinition(libVar.c_str()))
{
std::vector<std::string> libsVec;
cmSystemTools::ExpandListArgument(libs, libsVec);
for(std::vector<std::string>::const_iterator i = libsVec.begin();
i != libsVec.end(); ++i)
{
if(this->ImplicitLinkLibs.find(*i) == this->ImplicitLinkLibs.end())
{ {
std::vector<std::string> dirsVec; this->AddItem(i->c_str(), 0);
cmSystemTools::ExpandListArgument(dirs, dirsVec);
this->OrderLinkerSearchPath->AddLanguageDirectories(dirsVec);
} }
} }
} }
return true; // Add linker search paths for this language that are not
// implied by the linker language.
std::string dirVar = "CMAKE_";
dirVar += lang;
dirVar += "_IMPLICIT_LINK_DIRECTORIES";
if(const char* dirs = this->Makefile->GetDefinition(dirVar.c_str()))
{
std::vector<std::string> dirsVec;
cmSystemTools::ExpandListArgument(dirs, dirsVec);
this->OrderLinkerSearchPath->AddLanguageDirectories(dirsVec);
}
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
Source/cmComputeLinkInformation.h
View File

@ -163,6 +163,8 @@ private:
// Implicit link libraries and directories for linker language. // Implicit link libraries and directories for linker language.
void LoadImplicitLinkInfo(); void LoadImplicitLinkInfo();
void AddImplicitLinkInfo();
void AddImplicitLinkInfo(std::string const& lang);
std::set<cmStdString> ImplicitLinkDirs; std::set<cmStdString> ImplicitLinkDirs;
std::set<cmStdString> ImplicitLinkLibs; std::set<cmStdString> ImplicitLinkLibs;