diff options
| -rw-r--r-- | Source/cmMessageCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmMessageCommand.h | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx index fc02f5a..e275d75 100644 --- a/Source/cmMessageCommand.cxx +++ b/Source/cmMessageCommand.cxx @@ -72,7 +72,7 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args) cmSystemTools::Message(message.c_str()); } } - if(fatal_error || send_error) + if(fatal_error ) { cmSystemTools::SetFatalErrorOccured(); } diff --git a/Source/cmMessageCommand.h b/Source/cmMessageCommand.h index 15b56f9..c993351 100644 --- a/Source/cmMessageCommand.h +++ b/Source/cmMessageCommand.h @@ -66,9 +66,14 @@ public: return " MESSAGE([SEND_ERROR | STATUS | FATAL_ERROR]\n" " \"message to display\" ...)\n" - "The arguments are messages to display. If the first argument is " - "SEND_ERROR then an error is raised. If the first argument is " - "STATUS then the message is displayed in the progress line for the GUI."; + "By default the message is displayed in a pop up window (CMakeSetup), " + "or in the stdout of cmake, or the error section of ccmake. " + "If the first argument is " + "SEND_ERROR then an error is raised, and the generate phase will be " + "be skipped. If the first argument is FATAL_ERROR, all processing " + "is halted. If the first argument is STATUS then the message is " + "displayed in the progress line for the GUI, or with a -- in the " + "command line cmake."; } cmTypeMacro(cmMessageCommand, cmCommand); |