Merge topic 'use_normal_ouput_with_chdir'

4ddd3b9f Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.

Merge topic 'use_normal_ouput_with_chdir'
4ddd3b9f Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
e93d9c5c · David Cole · Kitware Robot · e8565090 · 4ddd3b9f · e93d9c5c
Commit e93d9c5c authored Aug 13, 2012 by David Cole Committed by Kitware Robot Aug 13, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Source/cmake.cxx Source/cmake.cxx +1 -1

No files found.
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1421,7 +1421,7 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
      int retval = 0;
      int timeout = 0;
      if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,
-             directory.c_str(), cmSystemTools::OUTPUT_MERGE, timeout) )
+             directory.c_str(), cmSystemTools::OUTPUT_NORMAL, timeout) )
        {
        return retval;
        }