mirror of
https://github.com/reactos/CMake.git
synced 2025-01-31 17:12:49 +00:00
ENH: fix docs, and revert fatal error change
This commit is contained in:
parent
0205c6bb1a
commit
269b66d50a
@ -72,7 +72,7 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args)
|
|||||||
cmSystemTools::Message(message.c_str());
|
cmSystemTools::Message(message.c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(fatal_error || send_error)
|
if(fatal_error )
|
||||||
{
|
{
|
||||||
cmSystemTools::SetFatalErrorOccured();
|
cmSystemTools::SetFatalErrorOccured();
|
||||||
}
|
}
|
||||||
|
@ -66,9 +66,14 @@ public:
|
|||||||
return
|
return
|
||||||
" MESSAGE([SEND_ERROR | STATUS | FATAL_ERROR]\n"
|
" MESSAGE([SEND_ERROR | STATUS | FATAL_ERROR]\n"
|
||||||
" \"message to display\" ...)\n"
|
" \"message to display\" ...)\n"
|
||||||
"The arguments are messages to display. If the first argument is "
|
"By default the message is displayed in a pop up window (CMakeSetup), "
|
||||||
"SEND_ERROR then an error is raised. If the first argument is "
|
"or in the stdout of cmake, or the error section of ccmake. "
|
||||||
"STATUS then the message is displayed in the progress line for the GUI.";
|
"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);
|
cmTypeMacro(cmMessageCommand, cmCommand);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user