diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-14 19:54:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-01-19 20:47:48 (GMT) |
| commit | ffa2a8c967df09c4630e50e7c7339e36b027ecaf (patch) | |
| tree | a44c6b548e8463f22d651ddd0bf8bc9ba117d69c | |
| parent | 92e9bb21758f73266e1f805e366ce90d2cbd688d (diff) | |
| download | CMake-ffa2a8c967df09c4630e50e7c7339e36b027ecaf.zip CMake-ffa2a8c967df09c4630e50e7c7339e36b027ecaf.tar.gz CMake-ffa2a8c967df09c4630e50e7c7339e36b027ecaf.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmSystemTools.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 2126c71..c50bf66 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1850,7 +1850,7 @@ int cmGlobalGenerator::Build( !makeCommand.empty() && cmSystemTools::LowerCase( cmSystemTools::GetFilenameName(makeCommand[0])) == "vcexpress.exe") { - outputflag = cmSystemTools::OUTPUT_NORMAL; + outputflag = cmSystemTools::OUTPUT_FORWARD; } // should we do a clean first? diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 9cafbec..f511ae4 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -203,7 +203,7 @@ public: * Output is controlled with outputflag. If outputflag is OUTPUT_NONE, no * user-viewable output from the program being run will be generated. * 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. * * If timeout is specified, the command will be terminated after @@ -223,7 +223,7 @@ public: { OUTPUT_NONE = 0, OUTPUT_MERGE, - OUTPUT_NORMAL, + OUTPUT_FORWARD, OUTPUT_PASSTHROUGH }; static bool RunSingleCommand(const char* command, |