diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-16 12:46:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-16 12:46:48 (GMT) |
| commit | 2a663ebce10fb9d393594e28f8ecc870488f6eba (patch) | |
| tree | 90f256dabded5657b3d8276776335ad5afd7b181 /Source/cmProcessTools.h | |
| parent | b6da714af79578bfdcbfe990addc557448b51eea (diff) | |
| parent | f55fcdc8598be03d0622dd5a7b96d33a6613a296 (diff) | |
| download | CMake-2a663ebce10fb9d393594e28f8ecc870488f6eba.zip CMake-2a663ebce10fb9d393594e28f8ecc870488f6eba.tar.gz CMake-2a663ebce10fb9d393594e28f8ecc870488f6eba.tar.bz2 | |
Merge topic 'childEncoding'
f55fcdc8 CTest: Use UTF-8 encoding for output from Git
40bd42df Add Encoding option for RunChild, RunMakeCommand and RunProcess
595feb32 Windows: Encode child process output to internally-used encoding
96103972 Add cmProcessOutput class to be used for decoding text data
92c865b8 cmCTestBuildHandler: Use size_t in ProcessBuffer length argument
Diffstat (limited to 'Source/cmProcessTools.h')
| -rw-r--r-- | Source/cmProcessTools.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmProcessTools.h b/Source/cmProcessTools.h index e5a3fe9..df131b9 100644 --- a/Source/cmProcessTools.h +++ b/Source/cmProcessTools.h @@ -3,6 +3,7 @@ #ifndef cmProcessTools_h #define cmProcessTools_h +#include "cmProcessOutput.h" #include <cmConfigure.h> #include <iosfwd> @@ -16,6 +17,7 @@ class cmProcessTools { public: + typedef cmProcessOutput::Encoding Encoding; /** Abstract interface for process output parsers. */ class OutputParser { @@ -79,7 +81,8 @@ public: /** Run a process and send output to given parsers. */ static void RunProcess(struct cmsysProcess_s* cp, OutputParser* out, - OutputParser* err = CM_NULLPTR); + OutputParser* err = CM_NULLPTR, + Encoding encoding = cmProcessOutput::Auto); }; #endif |