diff options
author | Brad King <brad.king@kitware.com> | 2014-05-15 09:48:39 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-05-15 10:29:08 -0400 |
commit | d7c692466bf100b077ffd0eef3a51fe1316782f0 (patch) | |
tree | d48d3118a23275376e69bbecb27a19b5cad8a17a | |
parent | 92ddf0c9e20af6158d84db34eeba795061fad1e9 (diff) | |
download | cmake-d7c692466bf100b077ffd0eef3a51fe1316782f0.tar.gz |
execute_process: Send stderr through cmSystemTools::Stderr
Give cmake-gui and ctest --build-and-test a chance to capture the output
instead of sending it to the real stderr.
-rw-r--r-- | Source/cmExecuteProcessCommand.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index 40f70b8c73..11f8ae55ba 100644 --- a/Source/cmExecuteProcessCommand.cxx +++ b/Source/cmExecuteProcessCommand.cxx @@ -256,10 +256,6 @@ bool cmExecuteProcessCommand // Check the output variables. bool merge_output = (output_variable == error_variable); - if(error_variable.empty() && !error_quiet) - { - cmsysProcess_SetPipeShared(cp, cmsysProcess_Pipe_STDERR, 1); - } if(!input_file.empty()) { cmsysProcess_SetPipeFile(cp, cmsysProcess_Pipe_STDIN, input_file.c_str()); @@ -307,7 +303,11 @@ bool cmExecuteProcessCommand } else if(p == cmsysProcess_Pipe_STDERR && !error_quiet) { - if(!error_variable.empty()) + if(error_variable.empty()) + { + cmSystemTools::Stderr(data, length); + } + else { cmExecuteProcessCommandAppend(tempError, data, length); } |