Merge topic 'fix-cmake-ISP-violation'

23f87e81 cmake: Remove force from IssueMessage API
54c65d5f cmake: Extract DisplayMessage API.
This commit is contained in:
Brad King
2016-06-13 09:54:27 -04:00
committed by CMake Topic Stage
5 changed files with 24 additions and 18 deletions
+3 -2
View File
@@ -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);