diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 03:07:31 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 15:06:56 (GMT) |
| commit | 1c1c2a1201682d17491026cb392c31ae5e63e1a5 (patch) | |
| tree | 4bd0b0c2244ef93643e9113b279d52ca76d2ea98 | |
| parent | c66084f5d7df57c991d0f498de04a5f00ae0fcc1 (diff) | |
| download | CMake-1c1c2a1201682d17491026cb392c31ae5e63e1a5.zip CMake-1c1c2a1201682d17491026cb392c31ae5e63e1a5.tar.gz CMake-1c1c2a1201682d17491026cb392c31ae5e63e1a5.tar.bz2 | |
cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 10 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 26119c3..f39a67d 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -4418,7 +4418,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names, void cmGeneratorTarget::ExpandLinkItems(std::string const& prop, std::string const& value, std::string const& config, - cmTarget const* headTarget, + cmGeneratorTarget const* headTarget, bool usage_requirements_only, std::vector<cmLinkItem>& items, bool& hadHeadSensitiveCondition) const @@ -4437,7 +4437,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop, this->Makefile, config, false, - headTarget, + headTarget->Target, this->Target, &dagChecker), libs); this->LookupLinkItems(libs, items); hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition(); @@ -4977,7 +4977,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( // The interface libraries have been explicitly set. this->ExpandLinkItems(linkIfaceProp, explicitLibraries, config, - headTarget->Target, usage_requirements_only, + headTarget, usage_requirements_only, iface.Libraries, iface.HadHeadSensitiveCondition); } @@ -5004,7 +5004,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( { bool hadHeadSensitiveConditionDummy = false; this->ExpandLinkItems(newProp, newExplicitLibraries, config, - headTarget->Target, + headTarget, usage_requirements_only, ifaceLibs, hadHeadSensitiveConditionDummy); } @@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config, cmSystemTools::ExpandListArgument(info->Languages, iface.Languages); this->ExpandLinkItems(info->LibrariesProp, info->Libraries, config, - headTarget->Target, usage_requirements_only, + headTarget, usage_requirements_only, iface.Libraries, iface.HadHeadSensitiveCondition); std::vector<std::string> deps; diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 03548e2..799110c 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -507,7 +507,8 @@ private: mutable std::set<std::string> LinkImplicitNullProperties; void ExpandLinkItems(std::string const& prop, std::string const& value, - std::string const& config, cmTarget const* headTarget, + std::string const& config, + const cmGeneratorTarget* headTarget, bool usage_requirements_only, std::vector<cmLinkItem>& items, bool& hadHeadSensitiveCondition) const; |