echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

message: Minor refactor to make code less verbose

Browse Source
This commit is contained in:
Alex Turbov 2019-10-10 22:42:23 +11:00 committed by Craig Scott
parent fe9a903d8e
commit 4b021bd3e9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/cmMessageCommand.cxx
View File

@ -21,6 +21,9 @@ bool cmMessageCommand(std::vector<std::string> const& args,
status.SetError("called with incorrect number of arguments"); status.SetError("called with incorrect number of arguments");
return false; return false;
} }
auto& mf = status.GetMakefile();
auto i = args.cbegin(); auto i = args.cbegin();
auto type = MessageType::MESSAGE; auto type = MessageType::MESSAGE;
@ -40,13 +43,12 @@ bool cmMessageCommand(std::vector<std::string> const& args,
level = cmake::LogLevel::LOG_WARNING; level = cmake::LogLevel::LOG_WARNING;
++i; ++i;
} else if (*i == "AUTHOR_WARNING") { } else if (*i == "AUTHOR_WARNING") {
if (status.GetMakefile().IsSet("CMAKE_SUPPRESS_DEVELOPER_ERRORS") && if (mf.IsSet("CMAKE_SUPPRESS_DEVELOPER_ERRORS") &&
!status.GetMakefile().IsOn("CMAKE_SUPPRESS_DEVELOPER_ERRORS")) { !mf.IsOn("CMAKE_SUPPRESS_DEVELOPER_ERRORS")) {
fatal = true; fatal = true;
type = MessageType::AUTHOR_ERROR; type = MessageType::AUTHOR_ERROR;
level = cmake::LogLevel::LOG_ERROR; level = cmake::LogLevel::LOG_ERROR;
} else if (!status.GetMakefile().IsOn( } else if (!mf.IsOn("CMAKE_SUPPRESS_DEVELOPER_WARNINGS")) {
"CMAKE_SUPPRESS_DEVELOPER_WARNINGS")) {
type = MessageType::AUTHOR_WARNING; type = MessageType::AUTHOR_WARNING;
level = cmake::LogLevel::LOG_WARNING; level = cmake::LogLevel::LOG_WARNING;
} else { } else {
@ -66,12 +68,12 @@ bool cmMessageCommand(std::vector<std::string> const& args,
level = cmake::LogLevel::LOG_TRACE; level = cmake::LogLevel::LOG_TRACE;
++i; ++i;
} else if (*i == "DEPRECATION") { } else if (*i == "DEPRECATION") {
if (status.GetMakefile().IsOn("CMAKE_ERROR_DEPRECATED")) { if (mf.IsOn("CMAKE_ERROR_DEPRECATED")) {
fatal = true; fatal = true;
type = MessageType::DEPRECATION_ERROR; type = MessageType::DEPRECATION_ERROR;
level = cmake::LogLevel::LOG_ERROR; level = cmake::LogLevel::LOG_ERROR;
} else if (!status.GetMakefile().IsSet("CMAKE_WARN_DEPRECATED") || } else if (!mf.IsSet("CMAKE_WARN_DEPRECATED") ||
status.GetMakefile().IsOn("CMAKE_WARN_DEPRECATED")) { mf.IsOn("CMAKE_WARN_DEPRECATED")) {
type = MessageType::DEPRECATION_WARNING; type = MessageType::DEPRECATION_WARNING;
level = cmake::LogLevel::LOG_WARNING; level = cmake::LogLevel::LOG_WARNING;
} else { } else {
@ -89,7 +91,7 @@ bool cmMessageCommand(std::vector<std::string> const& args,
assert("Message log level expected to be set" && assert("Message log level expected to be set" &&
level != cmake::LogLevel::LOG_UNDEFINED); level != cmake::LogLevel::LOG_UNDEFINED);
auto desiredLevel = status.GetMakefile().GetCMakeInstance()->GetLogLevel(); auto desiredLevel = mf.GetCMakeInstance()->GetLogLevel();
assert("Expected a valid log level here" && assert("Expected a valid log level here" &&
desiredLevel != cmake::LogLevel::LOG_UNDEFINED); desiredLevel != cmake::LogLevel::LOG_UNDEFINED);
@ -104,9 +106,8 @@ bool cmMessageCommand(std::vector<std::string> const& args,
// Check if any indentation has requested: // Check if any indentation has requested:
// `CMAKE_MESSAGE_INDENT` is a list of "padding" pieces // `CMAKE_MESSAGE_INDENT` is a list of "padding" pieces
// to be joined and prepended to the message lines. // to be joined and prepended to the message lines.
auto indent = cmJoin(cmExpandedList(status.GetMakefile().GetSafeDefinition( auto indent =
"CMAKE_MESSAGE_INDENT")), cmJoin(cmExpandedList(mf.GetSafeDefinition("CMAKE_MESSAGE_INDENT")), "");
"");
// Make every line of the `message` indented // Make every line of the `message` indented
// NOTE Can't reuse `cmDocumentationFormatter::PrintPreformatted` // NOTE Can't reuse `cmDocumentationFormatter::PrintPreformatted`
// here cuz it appends `\n` to the EOM ;-( // here cuz it appends `\n` to the EOM ;-(
@ -118,8 +119,7 @@ bool cmMessageCommand(std::vector<std::string> const& args,
case cmake::LogLevel::LOG_ERROR: case cmake::LogLevel::LOG_ERROR:
case cmake::LogLevel::LOG_WARNING: case cmake::LogLevel::LOG_WARNING:
// we've overridden the message type, above, so display it directly // we've overridden the message type, above, so display it directly
status.GetMakefile().GetMessenger()->DisplayMessage( mf.GetMessenger()->DisplayMessage(type, message, mf.GetBacktrace());
type, message, status.GetMakefile().GetBacktrace());
break; break;
case cmake::LogLevel::LOG_NOTICE: case cmake::LogLevel::LOG_NOTICE:
@ -130,7 +130,7 @@ bool cmMessageCommand(std::vector<std::string> const& args,
case cmake::LogLevel::LOG_VERBOSE: case cmake::LogLevel::LOG_VERBOSE:
case cmake::LogLevel::LOG_DEBUG: case cmake::LogLevel::LOG_DEBUG:
case cmake::LogLevel::LOG_TRACE: case cmake::LogLevel::LOG_TRACE:
status.GetMakefile().DisplayStatus(message, -1); mf.DisplayStatus(message, -1);
break; break;
default: default: