diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-12 16:15:10 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-23 09:14:45 -0400 |
| commit | bd9b667bbe83b112a9ea4448605fac980d2d8a68 (patch) | |
| tree | bdb19e46c5e54001516474229a888bad8477ac74 /Source/cmComputeLinkDepends.cxx | |
| parent | 06328dd58ee3de5d716b0d2b259927da2e173c1d (diff) | |
| download | cmake-bd9b667bbe83b112a9ea4448605fac980d2d8a68.tar.gz | |
cmComputeLinkInformation: Remove 'head' argument
It is only ever constructed with the current target as its own 'head'.
Co-Author: Stephen Kelly <steveire@gmail.com>
Diffstat (limited to 'Source/cmComputeLinkDepends.cxx')
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 336097be11..1aabdebe52 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -172,12 +172,10 @@ satisfy dependencies. //---------------------------------------------------------------------------- cmComputeLinkDepends -::cmComputeLinkDepends(cmTarget const* target, const std::string& config, - cmTarget const* head) +::cmComputeLinkDepends(cmTarget const* target, const std::string& config) { // Store context information. this->Target = target; - this->HeadTarget = head; this->Makefile = this->Target->GetMakefile(); this->LocalGenerator = this->Makefile->GetLocalGenerator(); this->GlobalGenerator = this->LocalGenerator->GetGlobalGenerator(); @@ -356,7 +354,7 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe) { // Follow the target dependencies. if(cmTarget::LinkInterface const* iface = - entry.Target->GetLinkInterface(this->Config, this->HeadTarget)) + entry.Target->GetLinkInterface(this->Config, this->Target)) { const bool isIface = entry.Target->GetType() == cmTarget::INTERFACE_LIBRARY; @@ -455,7 +453,7 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep) if(entry.Target) { if(cmTarget::LinkInterface const* iface = - entry.Target->GetLinkInterface(this->Config, this->HeadTarget)) + entry.Target->GetLinkInterface(this->Config, this->Target)) { // Follow public and private dependencies transitively. this->FollowSharedDeps(index, iface, true); @@ -544,7 +542,7 @@ void cmComputeLinkDepends::AddDirectLinkEntries() { // Add direct link dependencies in this configuration. cmTarget::LinkImplementation const* impl = - this->Target->GetLinkImplementation(this->Config, this->HeadTarget); + this->Target->GetLinkImplementation(this->Config, this->Target); this->AddLinkEntries(-1, impl->Libraries); for(std::vector<std::string>::const_iterator wi = impl->WrongConfigLibraries.begin(); @@ -955,7 +953,7 @@ int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl) if(cmTarget const* target = this->EntryList[*ni].Target) { if(cmTarget::LinkInterface const* iface = - target->GetLinkInterface(this->Config, this->HeadTarget)) + target->GetLinkInterface(this->Config, this->Target)) { if(iface->Multiplicity > count) { |