BUG: fix for 3815 seg fault
This commit is contained in:
parent
567d02c322
commit
d99ee73dff
|
@ -235,14 +235,20 @@ bool cmMacroHelperCommand::InvokeInitialPass
|
||||||
}
|
}
|
||||||
if(!this->Makefile->ExecuteCommand(newLFF))
|
if(!this->Makefile->ExecuteCommand(newLFF))
|
||||||
{
|
{
|
||||||
const char* filePath = args[0].FilePath;
|
cmListFileArgument arg;
|
||||||
if(!filePath)
|
if(args.size())
|
||||||
{
|
{
|
||||||
filePath = "Unknown";
|
arg.FilePath = args[0].FilePath;
|
||||||
|
arg.Line = args[0].Line;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
arg.FilePath = "Unknown";
|
||||||
|
arg.Line = 0;
|
||||||
}
|
}
|
||||||
cmOStringStream error;
|
cmOStringStream error;
|
||||||
error << "Error in cmake code at\n"
|
error << "Error in cmake code at\n"
|
||||||
<< filePath << ":" << args[0].Line << ":\n"
|
<< arg.FilePath << ":" << arg.Line << ":\n"
|
||||||
<< "A command failed during the invocation of macro \""
|
<< "A command failed during the invocation of macro \""
|
||||||
<< this->Args[0].c_str() << "\".";
|
<< this->Args[0].c_str() << "\".";
|
||||||
cmSystemTools::Error(error.str().c_str());
|
cmSystemTools::Error(error.str().c_str());
|
||||||
|
|
Loading…
Reference in New Issue