mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-29 10:39:28 -05:00
Merge topic 'fix-cmake-ISP-violation'
23f87e81cmake: Remove force from IssueMessage API54c65d5fcmake: Extract DisplayMessage API.
This commit is contained in:
@@ -64,8 +64,9 @@ bool cmMessageCommand::InitialPass(std::vector<std::string> const& args,
|
||||
std::string message = cmJoin(cmMakeRange(i, args.end()), std::string());
|
||||
|
||||
if (type != cmake::MESSAGE) {
|
||||
// we've overriden the message type, above, so force IssueMessage to use it
|
||||
this->Makefile->IssueMessage(type, message, true);
|
||||
// we've overriden the message type, above, so display it directly
|
||||
cmake* cm = this->Makefile->GetCMakeInstance();
|
||||
cm->DisplayMessage(type, message, this->Makefile->GetBacktrace());
|
||||
} else {
|
||||
if (status) {
|
||||
this->Makefile->DisplayStatus(message.c_str(), -1);
|
||||
|
||||
Reference in New Issue
Block a user