diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 02:56:37 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:22:20 (GMT) |
| commit | c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc (patch) | |
| tree | 90a9a0feddf42d5c425d16b64fa6ca5a20df7e67 /Source | |
| parent | a6e1f05c154d123b01bfe75c13d3e016c9074f72 (diff) | |
| download | CMake-c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc.zip CMake-c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc.tar.gz CMake-c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc.tar.bz2 | |
cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 12 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index e7399ed..5734edf 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -4546,7 +4546,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config, // The link implementation is the default link interface. cmLinkImplementationLibraries const* impl = this->GetLinkImplementationLibrariesInternal(config, - headTarget->Target); + headTarget); iface.ImplementationIsInterface = true; iface.WrongConfigLibraries = impl->WrongConfigLibraries; } @@ -4990,7 +4990,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( { // The link implementation is the default link interface. cmLinkImplementationLibraries const* impl = - this->GetLinkImplementationLibrariesInternal(config, headTarget->Target); + this->GetLinkImplementationLibrariesInternal(config, headTarget); iface.Libraries.insert(iface.Libraries.end(), impl->Libraries.begin(), impl->Libraries.end()); if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN && @@ -5263,13 +5263,13 @@ cmLinkImplementationLibraries const* cmGeneratorTarget::GetLinkImplementationLibraries( const std::string& config) const { - return this->GetLinkImplementationLibrariesInternal(config, this->Target); + return this->GetLinkImplementationLibrariesInternal(config, this); } //---------------------------------------------------------------------------- cmLinkImplementationLibraries const* cmGeneratorTarget::GetLinkImplementationLibrariesInternal( - const std::string& config, cmTarget const* head) const + const std::string& config, cmGeneratorTarget const* head) const { // There is no link implementation for imported targets. if(this->IsImported()) @@ -5289,11 +5289,11 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal( return &hm.begin()->second; } - cmOptionalLinkImplementation& impl = hm[head]; + cmOptionalLinkImplementation& impl = hm[head->Target]; if(!impl.LibrariesDone) { impl.LibrariesDone = true; - this->ComputeLinkImplementationLibraries(config, impl, head); + this->ComputeLinkImplementationLibraries(config, impl, head->Target); } return &impl; } diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index b832eea..7588a59 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -524,7 +524,7 @@ private: cmLinkImplementationLibraries const* GetLinkImplementationLibrariesInternal(const std::string& config, - cmTarget const* head) const; + const cmGeneratorTarget* head) const; bool ComputeOutputDir(const std::string& config, bool implib, std::string& out) const; |