diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2019-03-05 23:28:23 +0700 |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2019-04-27 18:36:45 +1000 |
| commit | 377d1b7896e07a171bcfe8da6d9dcda6545052c2 (patch) | |
| tree | 77aa86afe04a6cca916e7869d974582c2538d381 /Source | |
| parent | a9c113fd3e24f95908fedfb6cd2601d8a4795105 (diff) | |
| download | cmake-377d1b7896e07a171bcfe8da6d9dcda6545052c2.tar.gz | |
cmSystemTools: Remove unused message-related code, simplify logic
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSystemTools.cxx | 8 | ||||
| -rw-r--r-- | Source/cmSystemTools.h | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 212608d489..bc853b7f2a 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -168,7 +168,6 @@ bool cmSystemTools::s_RunCommandHideConsole = false; bool cmSystemTools::s_DisableRunCommandOutput = false; bool cmSystemTools::s_ErrorOccured = false; bool cmSystemTools::s_FatalErrorOccured = false; -bool cmSystemTools::s_DisableMessages = false; bool cmSystemTools::s_ForceUnixPaths = false; // replace replace with with as many times as it shows up in source. @@ -326,14 +325,11 @@ void cmSystemTools::Stdout(const std::string& s) void cmSystemTools::Message(const std::string& m, const char* title) { - if (s_DisableMessages) { - return; - } if (s_MessageCallback) { s_MessageCallback(m, title); - return; + } else { + std::cerr << m << std::endl; } - std::cerr << m << std::endl << std::flush; } void cmSystemTools::ReportLastSystemError(const char* msg) diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index a8b2d37809..05bd351754 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -266,8 +266,6 @@ public: static size_t CalculateCommandLineLengthLimit(); - static void EnableMessages() { s_DisableMessages = false; } - static void DisableMessages() { s_DisableMessages = true; } static void DisableRunCommandOutput() { s_DisableRunCommandOutput = true; } static void EnableRunCommandOutput() { s_DisableRunCommandOutput = false; } static bool GetRunCommandOutput() { return s_DisableRunCommandOutput; } @@ -540,7 +538,6 @@ private: static bool s_RunCommandHideConsole; static bool s_ErrorOccured; static bool s_FatalErrorOccured; - static bool s_DisableMessages; static bool s_DisableRunCommandOutput; }; |