diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-05 16:41:53 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-08 23:04:38 (GMT) |
| commit | 49017cddab23702d8228a195f64934e61ab7667e (patch) | |
| tree | 65e5583824eb7547f14ba223391378a8bb512786 /Source/cmGeneratorTarget.cxx | |
| parent | 0bae4a416f9f1b9090499d26f8508660f4f3fc95 (diff) | |
| download | CMake-49017cddab23702d8228a195f64934e61ab7667e.zip CMake-49017cddab23702d8228a195f64934e61ab7667e.tar.gz CMake-49017cddab23702d8228a195f64934e61ab7667e.tar.bz2 | |
cmGeneratorTarget: Move IsNullImpliedByLinkLibraries from cmTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 2f2fb3b..3651da6 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3928,7 +3928,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt, .find(p) != tgt->Target->GetProperties().end(); const bool impliedByUse = - tgt->Target->IsNullImpliedByLinkLibraries(p); + tgt->IsNullImpliedByLinkLibraries(p); assert((impliedByUse ^ explicitlySet) || (!impliedByUse && !explicitlySet)); @@ -5046,6 +5046,14 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal( } //---------------------------------------------------------------------------- +bool +cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const +{ + return this->LinkImplicitNullProperties.find(p) + != this->LinkImplicitNullProperties.end(); +} + +//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeLinkImplementationLibraries( const std::string& config, cmOptionalLinkImplementation& impl, @@ -5130,7 +5138,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries( { if (!this->GetProperty(*it)) { - this->Target->LinkImplicitNullProperties.insert(*it); + this->LinkImplicitNullProperties.insert(*it); } } cge->GetMaxLanguageStandard(this->Target, |