Commit 269b66d5 authored by Bill Hoffman's avatar Bill Hoffman

ENH: fix docs, and revert fatal error change

parent 0205c6bb
......@@ -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();
}
......
......@@ -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);
......
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