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

cmMessageCommand: Rename+move CheckingType → Message::CheckType

Browse Source 
And make this `enum` public.
This commit is contained in:
Alex Turbov 2024-08-17 08:52:57 +04:00
parent bb9071e9e7
commit a6cae9dbc4
No known key found for this signature in database
GPG Key ID: 8BEDB7D11F95D5E3
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmMessageCommand.cxx
View File

@ -26,14 +26,6 @@
namespace { namespace {
enum class CheckingType
{
UNDEFINED,
CHECK_START,
CHECK_PASS,
CHECK_FAIL
};
std::string IndentText(std::string text, cmMakefile& mf) std::string IndentText(std::string text, cmMakefile& mf)
{ {
auto indent = auto indent =
@ -106,7 +98,7 @@ bool cmMessageCommand(std::vector<std::string> const& args,
auto type = MessageType::MESSAGE; auto type = MessageType::MESSAGE;
auto fatal = false; auto fatal = false;
auto level = Message::LogLevel::LOG_UNDEFINED; auto level = Message::LogLevel::LOG_UNDEFINED;
auto checkingType = CheckingType::UNDEFINED; auto checkingType = Message::CheckType::UNDEFINED;
if (*i == "SEND_ERROR") { if (*i == "SEND_ERROR") {
type = MessageType::FATAL_ERROR; type = MessageType::FATAL_ERROR;
level = Message::LogLevel::LOG_ERROR; level = Message::LogLevel::LOG_ERROR;
@ -135,15 +127,15 @@ bool cmMessageCommand(std::vector<std::string> const& args,
++i; ++i;
} else if (*i == "CHECK_START") { } else if (*i == "CHECK_START") {
level = Message::LogLevel::LOG_STATUS; level = Message::LogLevel::LOG_STATUS;
checkingType = CheckingType::CHECK_START; checkingType = Message::CheckType::CHECK_START;
++i; ++i;
} else if (*i == "CHECK_PASS") { } else if (*i == "CHECK_PASS") {
level = Message::LogLevel::LOG_STATUS; level = Message::LogLevel::LOG_STATUS;
checkingType = CheckingType::CHECK_PASS; checkingType = Message::CheckType::CHECK_PASS;
++i; ++i;
} else if (*i == "CHECK_FAIL") { } else if (*i == "CHECK_FAIL") {
level = Message::LogLevel::LOG_STATUS; level = Message::LogLevel::LOG_STATUS;
checkingType = CheckingType::CHECK_FAIL; checkingType = Message::CheckType::CHECK_FAIL;
++i; ++i;
} else if (*i == "CONFIGURE_LOG") { } else if (*i == "CONFIGURE_LOG") {
#ifndef CMAKE_BOOTSTRAP #ifndef CMAKE_BOOTSTRAP
@ -217,16 +209,16 @@ bool cmMessageCommand(std::vector<std::string> const& args,
case Message::LogLevel::LOG_STATUS: case Message::LogLevel::LOG_STATUS:
switch (checkingType) { switch (checkingType) {
case CheckingType::CHECK_START: case Message::CheckType::CHECK_START:
mf.DisplayStatus(IndentText(message, mf), -1); mf.DisplayStatus(IndentText(message, mf), -1);
mf.GetCMakeInstance()->PushCheckInProgressMessage(message); mf.GetCMakeInstance()->PushCheckInProgressMessage(message);
break; break;
case CheckingType::CHECK_PASS: case Message::CheckType::CHECK_PASS:
ReportCheckResult("CHECK_PASS"_s, message, mf); ReportCheckResult("CHECK_PASS"_s, message, mf);
break; break;
case CheckingType::CHECK_FAIL: case Message::CheckType::CHECK_FAIL:
ReportCheckResult("CHECK_FAIL"_s, message, mf); ReportCheckResult("CHECK_FAIL"_s, message, mf);
break; break;

9
Source/cmMessageType.h
View File

@ -31,4 +31,13 @@ enum class LogLevel
LOG_DEBUG, LOG_DEBUG,
LOG_TRACE LOG_TRACE
}; };
enum class CheckType
{
UNDEFINED,
CHECK_START,
CHECK_PASS,
CHECK_FAIL
};
} }