From d7c692466bf100b077ffd0eef3a51fe1316782f0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 15 May 2014 09:48:39 -0400 Subject: [PATCH] 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. --- Source/cmExecuteProcessCommand.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index 40f70b8c7..11f8ae55b 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); }