From 5e41ba8e4a25bec2b5d7c175f80a1ace0999a8ff Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 17 Sep 2010 10:13:19 -0400 Subject: When using the API, check for Add vs. Remove --- Source/cmMakefile.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2908fa3..a9faa6b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3483,7 +3483,14 @@ void cmMakefile::RaiseScope(const char *var, const char *varDef) // 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(); - parent->AddDefinition(var, varDef); + if (varDef) + { + parent->AddDefinition(var, varDef); + } + else + { + parent->RemoveDefinition(var); + } } else { -- cgit v0.12