ENH: fix docs, and revert fatal error change

This commit is contained in:
Bill Hoffman 2006-01-25 11:07:46 -05:00
parent 0205c6bb1a
commit 269b66d50a
2 changed files with 9 additions and 4 deletions

View File

@ -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();
}

View File

@ -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);