cmGlobalUnixMakefileGenerator3: Inline an IsExcluded call.

This commit is contained in:
Stephen Kelly 2015-08-02 10:39:19 +02:00
parent be56feb618
commit 65c434e1b0
1 changed files with 9 additions and 1 deletions

View File

@ -936,9 +936,17 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
cmLocalGenerator* tlg = gt->GetLocalGenerator();
if(gt->GetType() == cmTarget::INTERFACE_LIBRARY
|| gt->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
continue;
}
// Consider the directory containing the target and all its
// parents until something excludes the target.
for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, gt);
for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, tlg);
clg = clg->GetParent())
{
// This local generator includes the target.