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

When using the API, check for Add vs. Remove

Browse Source
This commit is contained in:
Ben Boeckel 2010-09-17 10:13:19 -04:00
parent dee19760a7
commit 5e41ba8e4a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmMakefile.cxx
View File

@ -3483,8 +3483,15 @@ void cmMakefile::RaiseScope(const char *var, const char *varDef)
// directory's scope was initialized by the closure of the parent // directory's scope was initialized by the closure of the parent
// scope, so we do not need to localize the definition first. // scope, so we do not need to localize the definition first.
cmMakefile* parent = plg->GetMakefile(); cmMakefile* parent = plg->GetMakefile();
if (varDef)
{
parent->AddDefinition(var, varDef); parent->AddDefinition(var, varDef);
} }
else
{
parent->RemoveDefinition(var);
}
}
else else
{ {
cmOStringStream m; cmOStringStream m;