diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-13 17:26:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-13 17:26:48 (GMT) |
| commit | e93d9c5c2b8095cf94ebb92763604db0108e0818 (patch) | |
| tree | 7abce48f81fc9aeb0038ff19f124bc2dfae6de28 /Source/cmake.cxx | |
| parent | e85650909332f6ca84917e1b003192e6207ef304 (diff) | |
| parent | 4ddd3b9fd1f6f083561ba47acf6ed3cfc3d871c9 (diff) | |
| download | CMake-e93d9c5c2b8095cf94ebb92763604db0108e0818.zip CMake-e93d9c5c2b8095cf94ebb92763604db0108e0818.tar.gz CMake-e93d9c5c2b8095cf94ebb92763604db0108e0818.tar.bz2 | |
Merge topic 'use_normal_ouput_with_chdir'
4ddd3b9 Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
Diffstat (limited to 'Source/cmake.cxx')
| -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 fdc42fa..24ac966 100644 --- 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; } |