kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget.

This commit is contained in:
Stephen Kelly 2015-09-16 04:55:52 +02:00
parent 654002feb8
commit a6e1f05c15
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmGeneratorTarget.cxx
View File

@ -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;
}

2
Source/cmGeneratorTarget.h
View File

@ -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,