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

cmTarget: Drop GetTransitivePropertyTargets method 

Inline the implementation at the only remaining call site.
This commit is contained in:
Brad King 2014-07-15 11:42:43 -04:00
parent fb3518dc81
commit 0a8fbac19a
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -1098,10 +1098,20 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
if (std::find_if(transBegin, transEnd, if (std::find_if(transBegin, transEnd,
cmStrCmp(propertyName)) != transEnd) cmStrCmp(propertyName)) != transEnd)
{ {
std::vector<cmTarget const*> tgts; std::vector<cmTarget const*> tgts;
target->GetTransitivePropertyTargets(context->Config, if(cmTarget::LinkInterfaceLibraries const* iface =
headTarget, tgts); target->GetLinkInterfaceLibraries(context->Config, headTarget, true))
{
for(std::vector<cmLinkItem>::const_iterator
it = iface->Libraries.begin();
it != iface->Libraries.end(); ++it)
{
if (it->Target)
{
tgts.push_back(it->Target);
}
}
}
if (!tgts.empty()) if (!tgts.empty())
{ {
linkedTargetsContent = linkedTargetsContent =

19
Source/cmTarget.cxx
View File

@ -6054,25 +6054,6 @@ cmTarget::GetLinkImplementationClosure(const std::string& config) const
return tgts; return tgts;
} }
//----------------------------------------------------------------------------
void cmTarget::GetTransitivePropertyTargets(const std::string& config,
cmTarget const* headTarget,
std::vector<cmTarget const*> &tgts) const
{
if(cmTarget::LinkInterfaceLibraries const* iface =
this->GetLinkInterfaceLibraries(config, headTarget, true))
{
for(std::vector<cmLinkItem>::const_iterator it = iface->Libraries.begin();
it != iface->Libraries.end(); ++it)
{
if (it->Target)
{
tgts.push_back(it->Target);
}
}
}
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
cmTargetInternals::ComputeLinkInterfaceLibraries( cmTargetInternals::ComputeLinkInterfaceLibraries(

3
Source/cmTarget.h
View File

@ -296,9 +296,6 @@ public:
GetLinkInterfaceLibraries(const std::string& config, GetLinkInterfaceLibraries(const std::string& config,
cmTarget const* headTarget, cmTarget const* headTarget,
bool usage_requirements_only) const; bool usage_requirements_only) const;
void GetTransitivePropertyTargets(const std::string& config,
cmTarget const* headTarget,
std::vector<cmTarget const*> &libs) const;
std::vector<cmTarget const*> const& std::vector<cmTarget const*> const&
GetLinkImplementationClosure(const std::string& config) const; GetLinkImplementationClosure(const std::string& config) const;