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

cmGeneratorTarget: Port ExpandLinkItems away from cmTarget.

This commit is contained in:
Stephen Kelly 2015-09-16 05:07:31 +02:00
parent c66084f5d7
commit 1c1c2a1201
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGeneratorTarget.cxx
View File

@ -4418,7 +4418,7 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names,
void cmGeneratorTarget::ExpandLinkItems(std::string const& prop, void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
std::string const& value, std::string const& value,
std::string const& config, std::string const& config,
cmTarget const* headTarget, cmGeneratorTarget const* headTarget,
bool usage_requirements_only, bool usage_requirements_only,
std::vector<cmLinkItem>& items, std::vector<cmLinkItem>& items,
bool& hadHeadSensitiveCondition) const bool& hadHeadSensitiveCondition) const
@ -4437,7 +4437,7 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop,
this->Makefile, this->Makefile,
config, config,
false, false,
headTarget, headTarget->Target,
this->Target, &dagChecker), libs); this->Target, &dagChecker), libs);
this->LookupLinkItems(libs, items); this->LookupLinkItems(libs, items);
hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition(); hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition();
@ -4977,7 +4977,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
// The interface libraries have been explicitly set. // The interface libraries have been explicitly set.
this->ExpandLinkItems(linkIfaceProp, explicitLibraries, this->ExpandLinkItems(linkIfaceProp, explicitLibraries,
config, config,
headTarget->Target, usage_requirements_only, headTarget, usage_requirements_only,
iface.Libraries, iface.Libraries,
iface.HadHeadSensitiveCondition); iface.HadHeadSensitiveCondition);
} }
@ -5004,7 +5004,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries(
{ {
bool hadHeadSensitiveConditionDummy = false; bool hadHeadSensitiveConditionDummy = false;
this->ExpandLinkItems(newProp, newExplicitLibraries, config, this->ExpandLinkItems(newProp, newExplicitLibraries, config,
headTarget->Target, headTarget,
usage_requirements_only, usage_requirements_only,
ifaceLibs, hadHeadSensitiveConditionDummy); ifaceLibs, hadHeadSensitiveConditionDummy);
} }
@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config,
cmSystemTools::ExpandListArgument(info->Languages, iface.Languages); cmSystemTools::ExpandListArgument(info->Languages, iface.Languages);
this->ExpandLinkItems(info->LibrariesProp, info->Libraries, this->ExpandLinkItems(info->LibrariesProp, info->Libraries,
config, config,
headTarget->Target, usage_requirements_only, headTarget, usage_requirements_only,
iface.Libraries, iface.Libraries,
iface.HadHeadSensitiveCondition); iface.HadHeadSensitiveCondition);
std::vector<std::string> deps; std::vector<std::string> deps;

3
Source/cmGeneratorTarget.h
View File

@ -507,7 +507,8 @@ private:
mutable std::set<std::string> LinkImplicitNullProperties; mutable std::set<std::string> LinkImplicitNullProperties;
void ExpandLinkItems(std::string const& prop, std::string const& value, 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, bool usage_requirements_only,
std::vector<cmLinkItem>& items, std::vector<cmLinkItem>& items,
bool& hadHeadSensitiveCondition) const; bool& hadHeadSensitiveCondition) const;