kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Detect CMake warnings and errors in build output. 

Fix niggly in ExternalProject that would inadvertently
create a log file of output when a command was explicitly
set to the empty string.

Also, increase the default value for showing context
around build errors to 10 lines, up from 6. Also add
the ability to customize this setting so that users
can put it back to 6 or even lower if they want, or
show more if they want.
This commit is contained in:
David Cole 2010-07-02 13:22:30 -04:00
parent 012c986309
commit b2634b6aa3
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/ExternalProject.cmake
View File

@ -780,7 +780,7 @@ function(ExternalProject_Add_Step name step)
# Wrap with log script? # Wrap with log script?
get_property(log TARGET ${name} PROPERTY _EP_${step}_LOG) get_property(log TARGET ${name} PROPERTY _EP_${step}_LOG)
if(log) if(command AND log)
_ep_write_log_script(${name} ${step} command) _ep_write_log_script(${name} ${step} command)
endif() endif()

25
Source/CTest/cmCTestBuildHandler.cxx
View File

@ -65,7 +65,7 @@ static const char* cmCTestErrorMatches[] = {
"^Unresolved:", "^Unresolved:",
"Undefined symbols:", "Undefined symbols:",
"^Undefined[ \\t]+first referenced", "^Undefined[ \\t]+first referenced",
"^CMake Error:", "^CMake Error.*:",
":[ \\t]cannot find", ":[ \\t]cannot find",
":[ \\t]can't find", ":[ \\t]can't find",
": \\*\\*\\* No rule to make target \\`.*\\'. Stop", ": \\*\\*\\* No rule to make target \\`.*\\'. Stop",
@ -129,6 +129,7 @@ static const char* cmCTestWarningMatches[] = {
"\\([0-9]*\\): remark #[0-9]*", "\\([0-9]*\\): remark #[0-9]*",
"\".*\", line [0-9]+: remark\\([0-9]*\\):", "\".*\", line [0-9]+: remark\\([0-9]*\\):",
"cc-[0-9]* CC: REMARK File = .*, Line = [0-9]*", "cc-[0-9]* CC: REMARK File = .*, Line = [0-9]*",
"^CMake Warning.*:",
0 0
}; };
@ -174,8 +175,8 @@ cmCTestWarningErrorFileLine[] = {
//---------------------------------------------------------------------- //----------------------------------------------------------------------
cmCTestBuildHandler::cmCTestBuildHandler() cmCTestBuildHandler::cmCTestBuildHandler()
{ {
this->MaxPreContext = 6; this->MaxPreContext = 10;
this->MaxPostContext = 6; this->MaxPostContext = 10;
this->MaxErrors = 50; this->MaxErrors = 50;
this->MaxWarnings = 50; this->MaxWarnings = 50;
@ -214,8 +215,8 @@ void cmCTestBuildHandler::Initialize()
this->ErrorsAndWarnings.clear(); this->ErrorsAndWarnings.clear();
this->LastErrorOrWarning = this->ErrorsAndWarnings.end(); this->LastErrorOrWarning = this->ErrorsAndWarnings.end();
this->PostContextCount = 0; this->PostContextCount = 0;
this->MaxPreContext = 6; this->MaxPreContext = 10;
this->MaxPostContext = 6; this->MaxPostContext = 10;
this->PreContext.clear(); this->PreContext.clear();
this->TotalErrors = 0; this->TotalErrors = 0;
@ -249,6 +250,20 @@ void cmCTestBuildHandler::PopulateCustomVectors(cmMakefile *mf)
"CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS", "CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS",
this->MaxWarnings); this->MaxWarnings);
int n = -1;
this->CTest->PopulateCustomInteger(mf, "CTEST_CUSTOM_ERROR_PRE_CONTEXT", n);
if (n != -1)
{
this->MaxPreContext = static_cast<size_t>(n);
}
n = -1;
this->CTest->PopulateCustomInteger(mf, "CTEST_CUSTOM_ERROR_POST_CONTEXT", n);
if (n != -1)
{
this->MaxPostContext = static_cast<size_t>(n);
}
// Record the user-specified custom warning rules. // Record the user-specified custom warning rules.
if(const char* customWarningMatchers = if(const char* customWarningMatchers =
mf->GetDefinition("CTEST_CUSTOM_WARNING_MATCH")) mf->GetDefinition("CTEST_CUSTOM_WARNING_MATCH"))