diff options
| -rw-r--r-- | Source/cmake.cxx | 25 | ||||
| -rw-r--r-- | Source/cmake.h | 2 |
2 files changed, 19 insertions, 8 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index fe727cd..29f84df 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2436,14 +2436,8 @@ static bool cmakeCheckStampList(const char* stampList) return true; } -//---------------------------------------------------------------------------- -void cmake::IssueMessage(cmake::MessageType t, std::string const& text, - cmListFileBacktrace const& bt) +bool cmake::PrintMessagePreamble(cmake::MessageType t, std::ostream& msg) { - cmListFileBacktrace backtrace = bt; - backtrace.MakeRelative(); - - std::ostringstream msg; // Construct the message header. if(t == cmake::FATAL_ERROR) { @@ -2475,11 +2469,26 @@ void cmake::IssueMessage(cmake::MessageType t, std::string const& text, "CMAKE_SUPPRESS_DEVELOPER_WARNINGS"); if(suppress && cmSystemTools::IsOn(suppress)) { - return; + return false; } msg << " (dev)"; } } + return true; +} + +//---------------------------------------------------------------------------- +void cmake::IssueMessage(cmake::MessageType t, std::string const& text, + cmListFileBacktrace const& bt) +{ + cmListFileBacktrace backtrace = bt; + backtrace.MakeRelative(); + + std::ostringstream msg; + if (!this->PrintMessagePreamble(t, msg)) + { + return; + } // Add the immediate context. backtrace.PrintTitle(msg); diff --git a/Source/cmake.h b/Source/cmake.h index 0a1ee7d..d83c6fc 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -399,6 +399,8 @@ private: // Print a list of valid generators to stderr. void PrintGeneratorList(); + + bool PrintMessagePreamble(cmake::MessageType t, std::ostream& msg); }; #define CMAKE_STANDARD_OPTIONS_TABLE \ |