[cmake-commits] hoffman committed cmLocalGenerator.cxx 1.168 1.169

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
ENH: make the include flag required for a language avoids seg fault


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- cmLocalGenerator.cxx	7 Dec 2006 14:44:45 -0000	1.168
+++ cmLocalGenerator.cxx	23 Jan 2007 16:39:22 -0000	1.169
@@ -1047,7 +1047,8 @@
 
   std::string flagVar = "CMAKE_INCLUDE_FLAG_";
   flagVar += lang;
-  const char* includeFlag = this->Makefile->GetDefinition(flagVar.c_str());
+  const char* includeFlag = 
+    this->Makefile->GetRequiredDefinition(flagVar.c_str());
   flagVar = "CMAKE_INCLUDE_FLAG_SEP_";
   flagVar += lang;
   const char* sep = this->Makefile->GetDefinition(flagVar.c_str());
@@ -1076,7 +1077,7 @@
   const char* sysIncludeFlag = 0;
   if(repeatFlag)
     {
-    sysIncludeFlag = this->Makefile->GetDefinition(sysFlagVar.c_str());
+    sysIncludeFlag = this->Makefile->GetSafeDefinition(sysFlagVar.c_str());
     }
 
   bool flagUsed = false;