ENH: make the include flag required for a language avoids seg fault

This commit is contained in:
Bill Hoffman 2007-01-23 11:39:22 -05:00
parent e537b60ea2
commit 91bd8099d8
1 changed files with 3 additions and 2 deletions

View File

@ -1047,7 +1047,8 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
std::string flagVar = "CMAKE_INCLUDE_FLAG_"; std::string flagVar = "CMAKE_INCLUDE_FLAG_";
flagVar += lang; 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 = "CMAKE_INCLUDE_FLAG_SEP_";
flagVar += lang; flagVar += lang;
const char* sep = this->Makefile->GetDefinition(flagVar.c_str()); const char* sep = this->Makefile->GetDefinition(flagVar.c_str());
@ -1076,7 +1077,7 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
const char* sysIncludeFlag = 0; const char* sysIncludeFlag = 0;
if(repeatFlag) if(repeatFlag)
{ {
sysIncludeFlag = this->Makefile->GetDefinition(sysFlagVar.c_str()); sysIncludeFlag = this->Makefile->GetSafeDefinition(sysFlagVar.c_str());
} }
bool flagUsed = false; bool flagUsed = false;