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

BUG: Fix message(SEND_ERROR) to continue

Browse Source 
During testing of the new message() signatures I mistakenly concluded
that SEND_ERROR stops processing.  The corresponding commit enforced
this wrong behavior.  This restores the correct behavior and fixes the
documentation accordingly.
This commit is contained in:
Brad King 2009-03-06 12:06:43 -05:00
parent ca3b93d9c6
commit b04c37c700
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmMessageCommand.cxx
View File

@ -30,11 +30,18 @@ bool cmMessageCommand
cmake::MessageType type = cmake::MESSAGE; cmake::MessageType type = cmake::MESSAGE;
bool status = false; bool status = false;
if (*i == "SEND_ERROR" || *i == "FATAL_ERROR") bool fatal = false;
if (*i == "SEND_ERROR")
{ {
type = cmake::FATAL_ERROR; type = cmake::FATAL_ERROR;
++i; ++i;
} }
else if (*i == "FATAL_ERROR")
{
fatal = true;
type = cmake::FATAL_ERROR;
++i;
}
else if (*i == "WARNING") else if (*i == "WARNING")
{ {
type = cmake::WARNING; type = cmake::WARNING;
@ -71,6 +78,10 @@ bool cmMessageCommand
cmSystemTools::Message(message.c_str()); cmSystemTools::Message(message.c_str());
} }
} }
if(fatal)
{
cmSystemTools::SetFatalErrorOccured();
}
return true; return true;
} }

2
Source/cmMessageCommand.h
View File

@ -72,8 +72,8 @@ public:
" STATUS = Incidental information\n" " STATUS = Incidental information\n"
" WARNING = CMake Warning, continue processing\n" " WARNING = CMake Warning, continue processing\n"
" AUTHOR_WARNING = CMake Warning (dev), continue processing\n" " AUTHOR_WARNING = CMake Warning (dev), continue processing\n"
" SEND_ERROR = CMake Error, continue but skip generation\n"
" FATAL_ERROR = CMake Error, stop all processing\n" " FATAL_ERROR = CMake Error, stop all processing\n"
" SEND_ERROR = CMake Error, stop all processing (legacy)\n"
"The CMake command-line tool displays STATUS messages on stdout " "The CMake command-line tool displays STATUS messages on stdout "
"and all other message types on stderr. " "and all other message types on stderr. "
"The CMake GUI displays all messages in its log area. " "The CMake GUI displays all messages in its log area. "