diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 02:50:32 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:21:09 (GMT) |
| commit | 654002feb88a9a219e2d6b6011c7dccc791627b1 (patch) | |
| tree | 57d1ac4e939bcb08b2f2989df2095cb8691f0cce /Source | |
| parent | 922c89014f372ca38303b4258345c23027046616 (diff) | |
| download | CMake-654002feb88a9a219e2d6b6011c7dccc791627b1.zip CMake-654002feb88a9a219e2d6b6011c7dccc791627b1.tar.gz CMake-654002feb88a9a219e2d6b6011c7dccc791627b1.tar.bz2 | |
cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 15 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 67920af..a15d016 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -4478,7 +4478,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config, { iface.LibrariesDone = true; this->ComputeLinkInterfaceLibraries( - config, iface, head->Target, false); + config, iface, head, false); } if(!iface.AllDone) { @@ -4629,7 +4629,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config, { iface.LibrariesDone = true; this->ComputeLinkInterfaceLibraries( - config, iface, head->Target, usage_requirements_only); + config, iface, head, usage_requirements_only); } return iface.Exists? &iface : 0; @@ -4890,7 +4890,7 @@ void cmGeneratorTarget::ComputeLinkInterfaceLibraries( const std::string& config, cmOptionalLinkInterface& iface, - cmTarget const* headTarget, + cmGeneratorTarget const* headTarget, bool usage_requirements_only) const { // Construct the property name suffix for this configuration. @@ -4976,7 +4976,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( // The interface libraries have been explicitly set. this->ExpandLinkItems(linkIfaceProp, explicitLibraries, config, - headTarget, usage_requirements_only, + headTarget->Target, usage_requirements_only, iface.Libraries, iface.HadHeadSensitiveCondition); } @@ -4989,7 +4989,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( { // The link implementation is the default link interface. cmLinkImplementationLibraries const* impl = - this->GetLinkImplementationLibrariesInternal(config, headTarget); + this->GetLinkImplementationLibrariesInternal(config, headTarget->Target); iface.Libraries.insert(iface.Libraries.end(), impl->Libraries.begin(), impl->Libraries.end()); if(this->Target->GetPolicyStatusCMP0022() == cmPolicies::WARN && @@ -5003,8 +5003,9 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( { bool hadHeadSensitiveConditionDummy = false; this->ExpandLinkItems(newProp, newExplicitLibraries, config, - headTarget, usage_requirements_only, - ifaceLibs, hadHeadSensitiveConditionDummy); + headTarget->Target, + usage_requirements_only, + ifaceLibs, hadHeadSensitiveConditionDummy); } if (ifaceLibs != iface.Libraries) { diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index f3eaccd..bbd06a6 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -121,7 +121,7 @@ public: void ComputeLinkInterfaceLibraries(const std::string& config, cmOptionalLinkInterface &iface, - cmTarget const* head, + const cmGeneratorTarget* head, bool usage_requirements_only) const; /** Get the full path to the target according to the settings in its |