summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.h
diff options
context:
space:
mode:
authorPatrick Gansterer <paroga@paroga.com>2013-07-29 06:52:54 (GMT)
committerPatrick Gansterer <paroga@paroga.com>2013-07-29 06:52:54 (GMT)
commit2b473d2eaa2d09a69fc5a4f37d24ad051d5ead9a (patch)
treec310b0bd0e73d2ad99f3b7fd027c213e4dbbc80a /Source/cmSystemTools.h
parentfc1708ac99ead110417911609a2b67d4deae9d34 (diff)
downloadCMake-2b473d2eaa2d09a69fc5a4f37d24ad051d5ead9a.zip
CMake-2b473d2eaa2d09a69fc5a4f37d24ad051d5ead9a.tar.gz
CMake-2b473d2eaa2d09a69fc5a4f37d24ad051d5ead9a.tar.bz2
Add option to use stdout/stderr of original terminal in cmake --build
Pass the original file handles to the native tool when using the --use-stderr option in the build command. This enables the usage of advanced terminal features like colored output.
Diffstat (limited to 'Source/cmSystemTools.h')
-rw-r--r--Source/cmSystemTools.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 9614449..9d7dae9 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -211,7 +211,7 @@ public:
* 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
- * it was received.
+ * it was received. OUTPUT_PASSTHROUGH passes through the original handles.
*
* If timeout is specified, the command will be terminated after
* timeout expires. Timeout is specified in seconds.
@@ -230,7 +230,8 @@ public:
{
OUTPUT_NONE = 0,
OUTPUT_MERGE,
- OUTPUT_NORMAL
+ OUTPUT_NORMAL,
+ OUTPUT_PASSTHROUGH
};
static bool RunSingleCommand(const char* command, std::string* output = 0,
int* retVal = 0, const char* dir = 0,