summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-14 13:30:27 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-02-14 13:30:27 (GMT)
commit31e96ccca23a034700e780470bf48cff0d7fd15e (patch)
treec93d7ae905897e65414f31d02dbde1e1739cf7c5 /Source
parent11e9605179e340833d95115fb0178d2ee84b3e24 (diff)
parent07c3380a6e2a09b7e5976ddbacf385b8b4cde2cd (diff)
downloadCMake-31e96ccca23a034700e780470bf48cff0d7fd15e.zip
CMake-31e96ccca23a034700e780470bf48cff0d7fd15e.tar.gz
CMake-31e96ccca23a034700e780470bf48cff0d7fd15e.tar.bz2
Merge topic 'execute_process-default-encoding'
07c3380a execute_process: Restore no-decoding default behavior 4168bc18 Help: Improve execute_process ENCODING option documentation
Diffstat (limited to 'Source')
-rw-r--r--Source/cmExecuteProcessCommand.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx
index eb26a50..92cdf64 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -47,7 +47,7 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
std::string error_variable;
std::string result_variable;
std::string working_directory;
- cmProcessOutput::Encoding encoding = cmProcessOutput::Auto;
+ cmProcessOutput::Encoding encoding = cmProcessOutput::None;
for (size_t i = 0; i < args.size(); ++i) {
if (args[i] == "COMMAND") {
doing_command = true;