[cmake-commits] alex committed cmMakefile.cxx 1.427 1.428

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv27613

Modified Files:
	cmMakefile.cxx 
Log Message:
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


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -d -r1.427 -r1.428
--- cmMakefile.cxx	18 Jan 2008 01:34:10 -0000	1.427
+++ cmMakefile.cxx	18 Jan 2008 22:11:50 -0000	1.428
@@ -2999,8 +2999,8 @@
       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)