diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 02:49:37 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:20:30 (GMT) |
commit | 922c89014f372ca38303b4258345c23027046616 (patch) | |
tree | 9b80c729c1f133f4ac8cdcd7f69fa7bb94afa2f5 /Source/cmGeneratorTarget.cxx | |
parent | eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6 (diff) | |
download | CMake-922c89014f372ca38303b4258345c23027046616.zip CMake-922c89014f372ca38303b4258345c23027046616.tar.gz CMake-922c89014f372ca38303b4258345c23027046616.tar.bz2 |
cmGeneratorTarget: Port GetLinkInterface away from cmTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 13ef2a0..67920af 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1719,7 +1719,7 @@ public: this->Target->GetLocalGenerator()->GetGlobalGenerator() ->GetGeneratorTarget(item.Target); cmLinkInterface const* iface = - gtgt->GetLinkInterface(this->Config, this->HeadTarget->Target); + gtgt->GetLinkInterface(this->Config, this->HeadTarget); if(!iface) { return; } for(std::vector<std::string>::const_iterator @@ -4446,12 +4446,12 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop, //---------------------------------------------------------------------------- cmLinkInterface const* cmGeneratorTarget::GetLinkInterface(const std::string& config, - cmTarget const* head) const + cmGeneratorTarget const* head) const { // Imported targets have their own link interface. if(this->IsImported()) { - return this->GetImportLinkInterface(config, head, false); + return this->GetImportLinkInterface(config, head->Target, false); } // Link interfaces are not supported for executables that do not @@ -4473,19 +4473,19 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config, return &hm.begin()->second; } - cmOptionalLinkInterface& iface = hm[head]; + cmOptionalLinkInterface& iface = hm[head->Target]; if(!iface.LibrariesDone) { iface.LibrariesDone = true; this->ComputeLinkInterfaceLibraries( - config, iface, head, false); + config, iface, head->Target, false); } if(!iface.AllDone) { iface.AllDone = true; if(iface.Exists) { - this->ComputeLinkInterface(config, iface, head); + this->ComputeLinkInterface(config, iface, head->Target); } } |