From a6cae9dbc44af62f4185190b42c03e123885b6fc Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sat, 17 Aug 2024 08:52:57 +0400 Subject: [PATCH] =?UTF-8?q?cmMessageCommand:=20Rename+move=20`CheckingType?= =?UTF-8?q?`=20=E2=86=92=20`Message::CheckType`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And make this `enum` public. --- Source/cmMessageCommand.cxx | 22 +++++++--------------- Source/cmMessageType.h | 9 +++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx index a4b25384b3..3a40069803 100644 --- a/Source/cmMessageCommand.cxx +++ b/Source/cmMessageCommand.cxx @@ -26,14 +26,6 @@ namespace { -enum class CheckingType -{ - UNDEFINED, - CHECK_START, - CHECK_PASS, - CHECK_FAIL -}; - std::string IndentText(std::string text, cmMakefile& mf) { auto indent = @@ -106,7 +98,7 @@ bool cmMessageCommand(std::vector const& args, auto type = MessageType::MESSAGE; auto fatal = false; auto level = Message::LogLevel::LOG_UNDEFINED; - auto checkingType = CheckingType::UNDEFINED; + auto checkingType = Message::CheckType::UNDEFINED; if (*i == "SEND_ERROR") { type = MessageType::FATAL_ERROR; level = Message::LogLevel::LOG_ERROR; @@ -135,15 +127,15 @@ bool cmMessageCommand(std::vector const& args, ++i; } else if (*i == "CHECK_START") { level = Message::LogLevel::LOG_STATUS; - checkingType = CheckingType::CHECK_START; + checkingType = Message::CheckType::CHECK_START; ++i; } else if (*i == "CHECK_PASS") { level = Message::LogLevel::LOG_STATUS; - checkingType = CheckingType::CHECK_PASS; + checkingType = Message::CheckType::CHECK_PASS; ++i; } else if (*i == "CHECK_FAIL") { level = Message::LogLevel::LOG_STATUS; - checkingType = CheckingType::CHECK_FAIL; + checkingType = Message::CheckType::CHECK_FAIL; ++i; } else if (*i == "CONFIGURE_LOG") { #ifndef CMAKE_BOOTSTRAP @@ -217,16 +209,16 @@ bool cmMessageCommand(std::vector const& args, case Message::LogLevel::LOG_STATUS: switch (checkingType) { - case CheckingType::CHECK_START: + case Message::CheckType::CHECK_START: mf.DisplayStatus(IndentText(message, mf), -1); mf.GetCMakeInstance()->PushCheckInProgressMessage(message); break; - case CheckingType::CHECK_PASS: + case Message::CheckType::CHECK_PASS: ReportCheckResult("CHECK_PASS"_s, message, mf); break; - case CheckingType::CHECK_FAIL: + case Message::CheckType::CHECK_FAIL: ReportCheckResult("CHECK_FAIL"_s, message, mf); break; diff --git a/Source/cmMessageType.h b/Source/cmMessageType.h index decb4b3b12..747c46e8c9 100644 --- a/Source/cmMessageType.h +++ b/Source/cmMessageType.h @@ -31,4 +31,13 @@ enum class LogLevel LOG_DEBUG, LOG_TRACE }; + +enum class CheckType +{ + UNDEFINED, + CHECK_START, + CHECK_PASS, + CHECK_FAIL +}; + }