Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
CMake
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2,681
Issues
2,681
List
Boards
Labels
Milestones
Merge Requests
22
Merge Requests
22
Packages
Packages
Container Registry
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
CMake
CMake
Commits
377d1b78
Commit
377d1b78
authored
Mar 05, 2019
by
Alex Turbov
Committed by
Craig Scott
Apr 27, 2019
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmSystemTools: Remove unused message-related code, simplify logic
parent
a9c113fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
9 deletions
+2
-9
Source/cmSystemTools.cxx
Source/cmSystemTools.cxx
+2
-6
Source/cmSystemTools.h
Source/cmSystemTools.h
+0
-3
No files found.
Source/cmSystemTools.cxx
View file @
377d1b78
...
...
@@ -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
)
...
...
Source/cmSystemTools.h
View file @
377d1b78
...
...
@@ -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
;
};
...
...
Craig Scott
@craig.scott
mentioned in commit
e138207c
·
Apr 30, 2019
mentioned in commit
e138207c
mentioned in commit e138207c42f39e8cc49a7f954a75b2a8da522e6a
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment