diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 03:07:06 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:22:41 (GMT) |
| commit | c66084f5d7df57c991d0f498de04a5f00ae0fcc1 (patch) | |
| tree | e050d04f86a3ddb784b89a0251e0f6d8357ac408 /Source | |
| parent | 83c29e3903f947f9d4b5ed79a535f850b3b946e2 (diff) | |
| download | CMake-c66084f5d7df57c991d0f498de04a5f00ae0fcc1.zip CMake-c66084f5d7df57c991d0f498de04a5f00ae0fcc1.tar.gz CMake-c66084f5d7df57c991d0f498de04a5f00ae0fcc1.tar.bz2 | |
cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget.
Diffstat (limited to 'Source')
| -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 8a550bf..26119c3 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -4451,7 +4451,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config, // Imported targets have their own link interface. if(this->IsImported()) { - return this->GetImportLinkInterface(config, head->Target, false); + return this->GetImportLinkInterface(config, head, false); } // Link interfaces are not supported for executables that do not @@ -4599,7 +4599,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config, // Imported targets have their own link interface. if(this->IsImported()) { - return this->GetImportLinkInterface(config, head->Target, + return this->GetImportLinkInterface(config, head, usage_requirements_only); } @@ -5040,7 +5040,7 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( //---------------------------------------------------------------------------- const cmLinkInterface * cmGeneratorTarget::GetImportLinkInterface(const std::string& config, - cmTarget const* headTarget, + cmGeneratorTarget const* headTarget, bool usage_requirements_only) const { cmTarget::ImportInfo const* info = this->Target->GetImportInfo(config); @@ -5062,7 +5062,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config, return &hm.begin()->second; } - cmOptionalLinkInterface& iface = hm[headTarget]; + cmOptionalLinkInterface& iface = hm[headTarget->Target]; if(!iface.AllDone) { iface.AllDone = true; @@ -5070,7 +5070,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config, cmSystemTools::ExpandListArgument(info->Languages, iface.Languages); this->ExpandLinkItems(info->LibrariesProp, info->Libraries, config, - headTarget, usage_requirements_only, + headTarget->Target, usage_requirements_only, iface.Libraries, iface.HadHeadSensitiveCondition); std::vector<std::string> deps; diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 15b1b80..03548e2 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -491,7 +491,8 @@ private: std::string const& config) const; cmLinkInterface const* - GetImportLinkInterface(const std::string& config, cmTarget const* head, + GetImportLinkInterface(const std::string& config, + const cmGeneratorTarget* head, bool usage_requirements_only) const; typedef std::map<std::string, std::vector<cmSourceFile*> > |