mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmSystemTools: Remove unused message-related code, simplify logic

Browse Source
This commit is contained in:
Alex Turbov
2019-03-05 23:28:23 +07:00
committed by Craig Scott
parent a9c113fd3e
commit 377d1b7896
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmSystemTools.cxx
View File

@@ -168,7 +168,6 @@ bool cmSystemTools::s_RunCommandHideConsole = false;
bool cmSystemTools::s_DisableRunCommandOutput = false; bool cmSystemTools::s_DisableRunCommandOutput = false;
bool cmSystemTools::s_ErrorOccured = false; bool cmSystemTools::s_ErrorOccured = false;
bool cmSystemTools::s_FatalErrorOccured = false; bool cmSystemTools::s_FatalErrorOccured = false;
bool cmSystemTools::s_DisableMessages = false;
bool cmSystemTools::s_ForceUnixPaths = false; bool cmSystemTools::s_ForceUnixPaths = false;
// replace replace with with as many times as it shows up in source. // 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) void cmSystemTools::Message(const std::string& m, const char* title)
{ {
if (s_DisableMessages) {
return;
}
if (s_MessageCallback) { if (s_MessageCallback) {
s_MessageCallback(m, title); s_MessageCallback(m, title);
return; } else {
std::cerr << m << std::endl;
} }
std::cerr << m << std::endl << std::flush;
} }
void cmSystemTools::ReportLastSystemError(const char* msg) void cmSystemTools::ReportLastSystemError(const char* msg)

3
Source/cmSystemTools.h
View File

@@ -266,8 +266,6 @@ public:
static size_t CalculateCommandLineLengthLimit(); static size_t CalculateCommandLineLengthLimit();
static void EnableMessages() { s_DisableMessages = false; }
static void DisableMessages() { s_DisableMessages = true; }
static void DisableRunCommandOutput() { s_DisableRunCommandOutput = true; } static void DisableRunCommandOutput() { s_DisableRunCommandOutput = true; }
static void EnableRunCommandOutput() { s_DisableRunCommandOutput = false; } static void EnableRunCommandOutput() { s_DisableRunCommandOutput = false; }
static bool GetRunCommandOutput() { return s_DisableRunCommandOutput; } static bool GetRunCommandOutput() { return s_DisableRunCommandOutput; }
@@ -540,7 +538,6 @@ private:
static bool s_RunCommandHideConsole; static bool s_RunCommandHideConsole;
static bool s_ErrorOccured; static bool s_ErrorOccured;
static bool s_FatalErrorOccured; static bool s_FatalErrorOccured;
static bool s_DisableMessages;
static bool s_DisableRunCommandOutput; static bool s_DisableRunCommandOutput;
}; };