diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 03:04:51 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:22:27 (GMT) |
| commit | 83c29e3903f947f9d4b5ed79a535f850b3b946e2 (patch) | |
| tree | 625814dd7d0fc623fe120c083dae197d00ae3df0 | |
| parent | 1988255448d7e0f92f4d2f12cc8fc17b1429c328 (diff) | |
| download | CMake-83c29e3903f947f9d4b5ed79a535f850b3b946e2.zip CMake-83c29e3903f947f9d4b5ed79a535f850b3b946e2.tar.gz CMake-83c29e3903f947f9d4b5ed79a535f850b3b946e2.tar.bz2 | |
cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget.
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 8 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index b20921f..8a550bf 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -5111,7 +5111,7 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const if(!impl.LibrariesDone) { impl.LibrariesDone = true; - this->ComputeLinkImplementationLibraries(config, impl, this->Target); + this->ComputeLinkImplementationLibraries(config, impl, this); } if(!impl.LanguagesDone) { @@ -5293,7 +5293,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal( if(!impl.LibrariesDone) { impl.LibrariesDone = true; - this->ComputeLinkImplementationLibraries(config, impl, head->Target); + this->ComputeLinkImplementationLibraries(config, impl, head); } return &impl; } @@ -5310,7 +5310,7 @@ cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const void cmGeneratorTarget::ComputeLinkImplementationLibraries( const std::string& config, cmOptionalLinkImplementation& impl, - cmTarget const* head) const + cmGeneratorTarget const* head) const { cmStringRange entryRange = this->Target->GetLinkImplementationEntries(); @@ -5329,7 +5329,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries( cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge = ge.Parse(*le); std::string const evaluated = - cge->Evaluate(this->Makefile, config, false, head, &dagChecker); + cge->Evaluate(this->Makefile, config, false, head->Target, &dagChecker); cmSystemTools::ExpandListArgument(evaluated, llibs); if(cge->GetHadHeadSensitiveCondition()) { diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 7588a59..15b1b80 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -212,7 +212,7 @@ public: void ComputeLinkImplementationLibraries(const std::string& config, cmOptionalLinkImplementation& impl, - cmTarget const* head) const; + const cmGeneratorTarget* head) const; // Compute the set of languages compiled by the target. This is // computed every time it is called because the languages can change |