Commit 965ad87a authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: merge in fix for seg fault and move to RC 4

parent 58f67032
......@@ -7,7 +7,7 @@ SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 4)
SET(CMake_VERSION_PATCH 5)
# for an actual release this should not be defined
SET(CMake_VERSION_RC 3)
SET(CMake_VERSION_RC 4)
SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
......
Changes in CMake 2.4.5
* Fix for seg fault when a macro runs a bad command BUG# 3815
* Fix fix for foo.dll.lib that does not brea -L/usr/lib in link names
* Fix problem with LIBRARY_OUTPUT_PATH and linking to a dll foo.dll.lib
......
......@@ -235,14 +235,20 @@ bool cmMacroHelperCommand::InvokeInitialPass
}
if(!this->Makefile->ExecuteCommand(newLFF))
{
const char* filePath = args[0].FilePath;
if(!filePath)
cmListFileArgument arg;
if(args.size())
{
filePath = "Unknown";
arg.FilePath = args[0].FilePath;
arg.Line = args[0].Line;
}
else
{
arg.FilePath = "Unknown";
arg.Line = 0;
}
cmOStringStream error;
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 \""
<< this->Args[0].c_str() << "\".";
cmSystemTools::Error(error.str().c_str());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment