diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 02:55:52 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:21:11 (GMT) |
| commit | a6e1f05c154d123b01bfe75c13d3e016c9074f72 (patch) | |
| tree | 9629170280e3d09268c140ee38f66e5240a2d084 | |
| parent | 654002feb88a9a219e2d6b6011c7dccc791627b1 (diff) | |
| download | CMake-a6e1f05c154d123b01bfe75c13d3e016c9074f72.zip CMake-a6e1f05c154d123b01bfe75c13d3e016c9074f72.tar.gz CMake-a6e1f05c154d123b01bfe75c13d3e016c9074f72.tar.bz2 | |
cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 7 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index a15d016..e7399ed 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 bbd06a6..b832eea 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, |