kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalGenerator: Convert IsExcluded to loop.

This commit is contained in:
Stephen Kelly 2015-08-02 09:54:22 +02:00
parent 5f05b56284
commit 9b44018d52
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmGlobalGenerator.cxx
View File

@ -2046,27 +2046,23 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
{ {
assert(gen); assert(gen);
if(gen == root) cmLocalGenerator* lg = gen;
while (lg)
{ {
// No directory excludes itself. if(lg == root)
return false; {
} // No directory excludes itself.
return false;
}
if(gen->GetMakefile()->GetPropertyAsBool("EXCLUDE_FROM_ALL")) if(lg->GetMakefile()->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{ {
// This directory is excluded from its parent. // This directory is excluded from its parent.
return true; return true;
}
lg = lg->GetParent();
} }
return false;
cmLocalGenerator* lg = gen->GetParent();
if (!lg)
{
return false;
}
// This directory is included in its parent. Check whether the
// parent is excluded.
return this->IsExcluded(root, lg);
} }
bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root, bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,