cmGlobalGenerator: Extract new IsExcluded overload.

This commit is contained in:
Stephen Kelly committed 2015-08-24 20:03:29 +02:00
1 parent 45f5200396
commit be56feb618
2 files changed
+16 -6

No files matched your search

+14 -6
View File
@@ -2041,13 +2041,10 @@ void cmGlobalGenerator::SetConfiguredFilesPath(cmGlobalGenerator* gen)
}
}
bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
cmLocalGenerator* gen) const
bool cmGlobalGenerator::IsExcluded(cmState::Snapshot const& rootSnp,
cmState::Snapshot const& snp_) const
{
assert(gen);
cmState::Snapshot rootSnp = root->GetStateSnapshot();
cmState::Snapshot snp = gen->GetStateSnapshot();
cmState::Snapshot snp = snp_;
while (snp.IsValid())
{
if(snp == rootSnp)
@@ -2066,6 +2063,17 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
return false;
}
bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
cmLocalGenerator* gen) const
{
assert(gen);
cmState::Snapshot rootSnp = root->GetStateSnapshot();
cmState::Snapshot snp = gen->GetStateSnapshot();
return this->IsExcluded(rootSnp, snp);
}
bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
cmGeneratorTarget* target) const
{
+2
View File
@@ -396,6 +396,8 @@ protected:
// has been populated.
void FillProjectMap();
void CheckLocalGenerators();
bool IsExcluded(cmState::Snapshot const& root,
cmState::Snapshot const& snp) const;
bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen) const;
bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) const;
virtual void InitializeProgressMarks() {}