From 52b96e5bd9d4b6abf2213fd6c77b8ab61480f922 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 18 Jan 2008 17:11:50 -0500 Subject: BUG: don't crash if cmMakefile::RaiseScope() is called from a cmake file in the top level directory in normal code (i.e. not within a function) Alex --- Source/cmMakefile.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 5d2464f..6e99c17 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2999,8 +2999,8 @@ void cmMakefile::RaiseScope(const char *var, const char *varDef) this->DefinitionStack[this->DefinitionStack.size()-2].erase(var); } } - // otherwise do the parent - else + // otherwise do the parent (if one exists) + else if (this->LocalGenerator->GetParent()) { cmMakefile *parent = this->LocalGenerator->GetParent()->GetMakefile(); if (parent) -- cgit v0.12