diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 02:46:15 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:14:32 (GMT) |
| commit | eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6 (patch) | |
| tree | 607d48b46c7bce1d52c50801e67d1390be37a156 /Source | |
| parent | f539da126b55933fae6f40feea35e820cb632877 (diff) | |
| download | CMake-eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6.zip CMake-eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6.tar.gz CMake-eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6.tar.bz2 | |
cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 99d1013..13ef2a0 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1667,7 +1667,7 @@ public: cmTargetCollectLinkLanguages(cmGeneratorTarget const* target, const std::string& config, UNORDERED_SET<std::string>& languages, - cmTarget const* head): + cmGeneratorTarget const* head): Config(config), Languages(languages), HeadTarget(head), Makefile(target->Target->GetMakefile()), Target(target) { this->Visited.insert(target->Target); } @@ -1719,7 +1719,7 @@ public: this->Target->GetLocalGenerator()->GetGlobalGenerator() ->GetGeneratorTarget(item.Target); cmLinkInterface const* iface = - gtgt->GetLinkInterface(this->Config, this->HeadTarget); + gtgt->GetLinkInterface(this->Config, this->HeadTarget->Target); if(!iface) { return; } for(std::vector<std::string>::const_iterator @@ -1737,7 +1737,7 @@ public: private: std::string Config; UNORDERED_SET<std::string>& Languages; - cmTarget const* HeadTarget; + cmGeneratorTarget const* HeadTarget; cmMakefile* Makefile; const cmGeneratorTarget* Target; std::set<cmTarget const*> Visited; @@ -1830,7 +1830,7 @@ void cmGeneratorTarget::ComputeLinkClosure(const std::string& config, } // Add interface languages from linked targets. - cmTargetCollectLinkLanguages cll(this, config, languages, this->Target); + cmTargetCollectLinkLanguages cll(this, config, languages, this); for(std::vector<cmLinkImplItem>::const_iterator li = impl->Libraries.begin(); li != impl->Libraries.end(); ++li) { |