Merge topic 'use-generator-target'

aa29e64 Add a null check to the generator target accessor.
This commit is contained in:
Brad King 2013-11-22 08:41:03 -05:00 committed by CMake Topic Stage
commit a6080587aa
1 changed files with 5 additions and 2 deletions

View File

@ -4086,8 +4086,11 @@ bool cmMakefile::IsAlias(const char *name)
//----------------------------------------------------------------------------
cmGeneratorTarget* cmMakefile::FindGeneratorTargetToUse(const char* name)
{
cmTarget *t = this->FindTargetToUse(name);
return this->LocalGenerator->GetGlobalGenerator()->GetGeneratorTarget(t);
if (cmTarget *t = this->FindTargetToUse(name))
{
return this->LocalGenerator->GetGlobalGenerator()->GetGeneratorTarget(t);
}
return 0;
}
//----------------------------------------------------------------------------