mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-14 19:08:07 +08:00
cmCPackLog: Fix support for multiple log message tags
Fix logic from commit bbf1c2d275
(ENH: More improvements and add
logging, 2006-01-02, v2.4.0~712) to append to the accumulated tag string
instead of overwriting it for each type of message.
Issue: #19610
This commit is contained in:
@@ -83,7 +83,7 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg,
|
||||
if (!tagString.empty()) {
|
||||
tagString += ",";
|
||||
}
|
||||
tagString = "VERBOSE";
|
||||
tagString += "VERBOSE";
|
||||
}
|
||||
}
|
||||
if (tag & LOG_WARNING) {
|
||||
@@ -93,7 +93,7 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg,
|
||||
if (!tagString.empty()) {
|
||||
tagString += ",";
|
||||
}
|
||||
tagString = "WARNING";
|
||||
tagString += "WARNING";
|
||||
}
|
||||
}
|
||||
if (tag & LOG_ERROR) {
|
||||
@@ -103,7 +103,7 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg,
|
||||
if (!tagString.empty()) {
|
||||
tagString += ",";
|
||||
}
|
||||
tagString = "ERROR";
|
||||
tagString += "ERROR";
|
||||
}
|
||||
}
|
||||
if (tag & LOG_DEBUG && this->Debug) {
|
||||
@@ -113,7 +113,7 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg,
|
||||
if (!tagString.empty()) {
|
||||
tagString += ",";
|
||||
}
|
||||
tagString = "DEBUG";
|
||||
tagString += "DEBUG";
|
||||
}
|
||||
useFileAndLine = true;
|
||||
}
|
||||
@@ -124,7 +124,7 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg,
|
||||
if (!tagString.empty()) {
|
||||
tagString += ",";
|
||||
}
|
||||
tagString = "VERBOSE";
|
||||
tagString += "VERBOSE";
|
||||
}
|
||||
}
|
||||
if (this->Quiet) {
|
||||
|
Reference in New Issue
Block a user