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

cmCPackLog: Fix support for multiple log message tags

Browse Source 
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:
Brad King 2019-08-22 11:36:49 -04:00
parent 74f2c0ea56
commit 7fe3e874d5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/CPack/cmCPackLog.cxx
View File

@ -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) {