diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2012-07-20 15:09:52 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2012-07-20 15:09:52 (GMT) |
| commit | 4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9 (patch) | |
| tree | 4a10a28dba49732d62a5276e17d4419f7ab8f5b2 | |
| parent | caeca30936fee174fd36cb3bb0ecb45847aae873 (diff) | |
| download | CMake-4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9.zip CMake-4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9.tar.gz CMake-4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9.tar.bz2 | |
Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
Using OUTPUT_MERGE can cause the output to be jumbled in some cases.
| -rw-r--r-- | Source/cmake.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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<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; } |