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

cmTarget: De-duplicate link interface genex code for $<LINK_ONLY> 

Simplify the implementation of GetTransitivePropertyTargets by using
ExpandLinkItems with usage_requirements_only==true to evaluate the
generator expressions in the link interface for us.
This commit is contained in:
Brad King 2014-06-16 14:25:40 -04:00
parent 1001490df2
commit b030a7f1ca
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmTarget.cxx
View File

@ -6235,24 +6235,16 @@ void cmTarget::GetTransitivePropertyTargets(const std::string& config,
} }
// The interface libraries have been explicitly set. // The interface libraries have been explicitly set.
cmGeneratorExpression ge; std::vector<cmLinkItem> libs;
cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), this->ExpandLinkItems(linkIfaceProp, interfaceLibs, config,
linkIfaceProp, 0, 0); headTarget, true, libs);
dagChecker.SetTransitivePropertiesOnly();
std::vector<std::string> libs;
cmSystemTools::ExpandListArgument(ge.Parse(interfaceLibs)->Evaluate(
this->Makefile,
config,
false,
headTarget,
this, &dagChecker), libs);
for(std::vector<std::string>::const_iterator it = libs.begin(); for(std::vector<cmLinkItem>::const_iterator it = libs.begin();
it != libs.end(); ++it) it != libs.end(); ++it)
{ {
if (cmTarget const* tgt = this->FindTargetToLink(*it)) if (it->Target)
{ {
tgts.push_back(tgt); tgts.push_back(it->Target);
} }
} }
} }