From 4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 20 Jul 2012 11:09:52 -0400 Subject: Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir. Using OUTPUT_MERGE can cause the output to be jumbled in some cases. --- Source/cmake.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 451aec8..f523423 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1423,7 +1423,7 @@ int cmake::ExecuteCMakeCommand(std::vector& 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; } -- cgit v0.12