kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmSystemTools: Rename OUTPUT_NORMAL to OUTPUT_FORWARD to clarify its purpose 

The OUTPUT_NORMAL value is not really "normal" and has only one caller.
Rename it to OUTPUT_FORWARD to clarify that we are explicitly forwarding
the output.
This commit is contained in:
Brad King 2016-01-14 14:54:58 -05:00
parent 92e9bb2175
commit ffa2a8c967
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalGenerator.cxx
View File

@ -1850,7 +1850,7 @@ int cmGlobalGenerator::Build(
!makeCommand.empty() && cmSystemTools::LowerCase( !makeCommand.empty() && cmSystemTools::LowerCase(
cmSystemTools::GetFilenameName(makeCommand[0])) == "vcexpress.exe") cmSystemTools::GetFilenameName(makeCommand[0])) == "vcexpress.exe")
{ {
outputflag = cmSystemTools::OUTPUT_NORMAL; outputflag = cmSystemTools::OUTPUT_FORWARD;
} }
// should we do a clean first? // should we do a clean first?

4
Source/cmSystemTools.h
View File

@ -203,7 +203,7 @@ public:
* Output is controlled with outputflag. If outputflag is OUTPUT_NONE, no * Output is controlled with outputflag. If outputflag is OUTPUT_NONE, no
* user-viewable output from the program being run will be generated. * user-viewable output from the program being run will be generated.
* OUTPUT_MERGE is the legacy behaviour where stdout and stderr are merged * OUTPUT_MERGE is the legacy behaviour where stdout and stderr are merged
* into stdout. OUTPUT_NORMAL passes through the output to stdout/stderr as * into stdout. OUTPUT_FORWARD copies the output to stdout/stderr as
* it was received. OUTPUT_PASSTHROUGH passes through the original handles. * it was received. OUTPUT_PASSTHROUGH passes through the original handles.
* *
* If timeout is specified, the command will be terminated after * If timeout is specified, the command will be terminated after
@ -223,7 +223,7 @@ public:
{ {
OUTPUT_NONE = 0, OUTPUT_NONE = 0,
OUTPUT_MERGE, OUTPUT_MERGE,
OUTPUT_NORMAL, OUTPUT_FORWARD,
OUTPUT_PASSTHROUGH OUTPUT_PASSTHROUGH
}; };
static bool RunSingleCommand(const char* command, static bool RunSingleCommand(const char* command,