cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.

This commit is contained in:
Stephen Kelly
2015-06-06 14:09:35 +02:00
parent 22590805bf
commit dd11f72ced
6 changed files with 18 additions and 15 deletions
+6 -4
View File
@@ -111,17 +111,19 @@ bool cmGlobalVisualStudioGenerator::Compute()
for(std::vector<cmLocalGenerator*>::iterator i = gen.begin();
i != gen.end(); ++i)
{
cmTargets& targets = (*i)->GetMakefile()->GetTargets();
for(cmTargets::iterator t = targets.begin();
cmGeneratorTargetsType targets =
(*i)->GetMakefile()->GetGeneratorTargets();
for(cmGeneratorTargetsType::iterator t = targets.begin();
t != targets.end(); ++t)
{
if (t->second.GetType() == cmTarget::GLOBAL_TARGET)
if (t->second->GetType() == cmTarget::GLOBAL_TARGET
|| t->first->IsImported())
{
continue;
}
if(!this->IsExcluded(gen[0], t->second))
{
allBuild->AddUtility(t->second.GetName());
allBuild->AddUtility(t->second->GetName());
}
}
}