diff options
| author | Brad King <brad.king@kitware.com> | 2009-03-06 17:06:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-03-06 17:06:43 (GMT) |
| commit | b04c37c700d8da00849a65203c19067122340391 (patch) | |
| tree | 0973500b73ad9c94a5145e80114e0ee8f2889ebd /Source | |
| parent | ca3b93d9c6a816afd7a07bf218c8884510219cf4 (diff) | |
| download | CMake-b04c37c700d8da00849a65203c19067122340391.zip CMake-b04c37c700d8da00849a65203c19067122340391.tar.gz CMake-b04c37c700d8da00849a65203c19067122340391.tar.bz2 | |
BUG: Fix message(SEND_ERROR) to continue
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.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMessageCommand.cxx | 13 | ||||
| -rw-r--r-- | Source/cmMessageCommand.h | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx index 7e66e05..90f023b 100644 --- a/Source/cmMessageCommand.cxx +++ b/Source/cmMessageCommand.cxx @@ -30,11 +30,18 @@ bool cmMessageCommand cmake::MessageType type = cmake::MESSAGE; bool status = false; - if (*i == "SEND_ERROR" || *i == "FATAL_ERROR") + bool fatal = false; + if (*i == "SEND_ERROR") { type = cmake::FATAL_ERROR; ++i; } + else if (*i == "FATAL_ERROR") + { + fatal = true; + type = cmake::FATAL_ERROR; + ++i; + } else if (*i == "WARNING") { type = cmake::WARNING; @@ -71,6 +78,10 @@ bool cmMessageCommand cmSystemTools::Message(message.c_str()); } } + if(fatal) + { + cmSystemTools::SetFatalErrorOccured(); + } return true; } diff --git a/Source/cmMessageCommand.h b/Source/cmMessageCommand.h index f2496f4..068dd57 100644 --- a/Source/cmMessageCommand.h +++ b/Source/cmMessageCommand.h @@ -72,8 +72,8 @@ public: " STATUS = Incidental information\n" " WARNING = CMake Warning, 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" - " SEND_ERROR = CMake Error, stop all processing (legacy)\n" "The CMake command-line tool displays STATUS messages on stdout " "and all other message types on stderr. " "The CMake GUI displays all messages in its log area. " |