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

cmTarget: Remove 'head' argument from GetTransitiveTargetClosure

Browse Source 
The method is never called with any headTarget besides "this".
This commit is contained in:
Brad King 2014-06-11 10:39:13 -04:00
parent 962f2c3529
commit 2f0004c143
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmTarget.cxx
View File

@ -5207,7 +5207,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
|| (!impliedByUse && !explicitlySet)); || (!impliedByUse && !explicitlySet));
std::vector<cmTarget*> deps; std::vector<cmTarget*> deps;
tgt->GetTransitiveTargetClosure(config, tgt, deps); tgt->GetTransitiveTargetClosure(config, deps);
if(deps.empty()) if(deps.empty())
{ {
@ -5423,7 +5423,7 @@ bool isLinkDependentProperty(cmTarget const* tgt, const std::string &p,
const std::string& config) const std::string& config)
{ {
std::vector<cmTarget*> deps; std::vector<cmTarget*> deps;
tgt->GetTransitiveTargetClosure(config, tgt, deps); tgt->GetTransitiveTargetClosure(config, deps);
if(deps.empty()) if(deps.empty())
{ {
@ -6143,18 +6143,17 @@ void processILibs(const std::string& config,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmTarget::GetTransitiveTargetClosure(const std::string& config, void cmTarget::GetTransitiveTargetClosure(const std::string& config,
cmTarget const* headTarget,
std::vector<cmTarget*> &tgts) const std::vector<cmTarget*> &tgts) const
{ {
std::set<cmTarget*> emitted; std::set<cmTarget*> emitted;
cmTarget::LinkImplementation const* impl cmTarget::LinkImplementation const* impl
= this->GetLinkImplementationLibraries(config, headTarget); = this->GetLinkImplementationLibraries(config, this);
for(std::vector<std::string>::const_iterator it = impl->Libraries.begin(); for(std::vector<std::string>::const_iterator it = impl->Libraries.begin();
it != impl->Libraries.end(); ++it) it != impl->Libraries.end(); ++it)
{ {
processILibs(config, headTarget, *it, tgts, emitted); processILibs(config, this, *it, tgts, emitted);
} }
} }

1
Source/cmTarget.h
View File

@ -277,7 +277,6 @@ public:
cmTarget const* headTarget, cmTarget const* headTarget,
std::vector<cmTarget*> &libs) const; std::vector<cmTarget*> &libs) const;
void GetTransitiveTargetClosure(const std::string& config, void GetTransitiveTargetClosure(const std::string& config,
cmTarget const* headTarget,
std::vector<cmTarget*> &libs) const; std::vector<cmTarget*> &libs) const;
/** The link implementation specifies the direct library /** The link implementation specifies the direct library