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

cmMakefile: Use early return to reduce nested code.

Browse Source
This commit is contained in:
Stephen Kelly 2015-05-17 13:24:18 +02:00
parent bdd1aa91ae
commit c8cb66880c
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/cmMakefile.cxx
View File

@ -110,23 +110,24 @@ public:
++it; ++it;
if(it == this->VarStack.rend()) if(it == this->VarStack.rend())
{ {
if(cmLocalGenerator* plg = mf->GetLocalGenerator()->GetParent()) cmLocalGenerator* plg = mf->GetLocalGenerator()->GetParent();
if(!plg)
{ {
// Update the definition in the parent directory top scope. This return false;
// directory's scope was initialized by the closure of the parent
// scope, so we do not need to localize the definition first.
cmMakefile* parent = plg->GetMakefile();
if (varDef)
{
parent->AddDefinition(var, varDef);
}
else
{
parent->RemoveDefinition(var);
}
return true;
} }
return false; // Update the definition in the parent directory top scope. This
// directory's scope was initialized by the closure of the parent
// scope, so we do not need to localize the definition first.
cmMakefile* parent = plg->GetMakefile();
if (varDef)
{
parent->AddDefinition(var, varDef);
}
else
{
parent->RemoveDefinition(var);
}
return true;
} }
// First localize the definition in the current scope. // First localize the definition in the current scope.
this->GetDefinition(var); this->GetDefinition(var);