diff options
| author | Johan Björk <phb@spotify.com> | 2011-07-26 07:26:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-07-28 14:42:03 (GMT) |
| commit | 856a9e499f299a33cb4f763bf36a75524a03e4f5 (patch) | |
| tree | 794e18a7cef0ec581600e271ffd0a7a842d4a6a2 /Source/cmake.cxx | |
| parent | 4096066723ec7dd6f450e1c8da13616c0ca2f124 (diff) | |
| download | CMake-856a9e499f299a33cb4f763bf36a75524a03e4f5.zip CMake-856a9e499f299a33cb4f763bf36a75524a03e4f5.tar.gz CMake-856a9e499f299a33cb4f763bf36a75524a03e4f5.tar.bz2 | |
RunSingleCommand: Replace verbose boolean with enum
No behaviour change, this prepares for adding a flag to skip the merging
of output streams.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 45927cb..3473d91 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1297,7 +1297,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(), true, timeout) ) + directory.c_str(), cmSystemTools::OUTPUT_MERGE, timeout) ) { return retval; } @@ -3978,7 +3978,7 @@ bool cmake::RunCommand(const char* comment, // use rc command to create .res file cmSystemTools::RunSingleCommand(command, &output, - &retCode, 0, false); + &retCode, 0, cmSystemTools::OUTPUT_NONE); // always print the output of the command, unless // it is the dumb rc command banner, but if the command // returned an error code then print the output anyway as @@ -4338,7 +4338,8 @@ int cmake::Build(const std::string& dir, projName.c_str(), target.c_str(), &output, makeProgram.c_str(), - config.c_str(), clean, false, 0, true, + config.c_str(), clean, false, 0, + cmSystemTools::OUTPUT_MERGE, 0, nativeOptions); } |