From a6e1f05c154d123b01bfe75c13d3e016c9074f72 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 16 Sep 2015 04:55:52 +0200 Subject: [PATCH] cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget. --- Source/cmGeneratorTarget.cxx | 7 ++++--- Source/cmGeneratorTarget.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index a15d016fd..e7399edba 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -4485,7 +4485,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config, iface.AllDone = true; if(iface.Exists) { - this->ComputeLinkInterface(config, iface, head->Target); + this->ComputeLinkInterface(config, iface, head); } } @@ -4495,7 +4495,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config, //---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeLinkInterface(const std::string& config, cmOptionalLinkInterface &iface, - cmTarget const* headTarget) const + cmGeneratorTarget const* headTarget) const { if(iface.ExplicitLibraries) { @@ -4545,7 +4545,8 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config, { // The link implementation is the default link interface. cmLinkImplementationLibraries const* - impl = this->GetLinkImplementationLibrariesInternal(config, headTarget); + impl = this->GetLinkImplementationLibrariesInternal(config, + headTarget->Target); iface.ImplementationIsInterface = true; iface.WrongConfigLibraries = impl->WrongConfigLibraries; } diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index bbd06a60a..b832eeaa6 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -112,7 +112,7 @@ public: const cmGeneratorTarget* headTarget) const; void ComputeLinkInterface(const std::string& config, cmOptionalLinkInterface& iface, - cmTarget const* head) const; + const cmGeneratorTarget* head) const; cmLinkInterfaceLibraries const* GetLinkInterfaceLibraries(const std::string& config,