diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-02 19:09:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-02 19:09:57 (GMT) |
| commit | 2444d6f55eb0e66893c0e86b10e466ceaae32e31 (patch) | |
| tree | 3d0194718b7701ed40cc3a37d78b75b950452998 /Source/cmake.cxx | |
| parent | 39faba7e30151a6c884d2ec38932235223b9821d (diff) | |
| parent | a343bc1c764c87b20edbdf960d870fd4b084ce8a (diff) | |
| download | CMake-2444d6f55eb0e66893c0e86b10e466ceaae32e31.zip CMake-2444d6f55eb0e66893c0e86b10e466ceaae32e31.tar.gz CMake-2444d6f55eb0e66893c0e86b10e466ceaae32e31.tar.bz2 | |
Merge topic 'split-stdout-stderr'
a343bc1 RunSingleCommand: Avoid assignment in condition
642f100 RunSingleCommand: Add a OUTPUT_NORMAL flag.
856a9e4 RunSingleCommand: Replace verbose boolean with enum
4096066 RunSingleCommand: Fix indentation
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index ec87ab6..51cc9d4 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1299,7 +1299,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; } @@ -3984,7 +3984,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 @@ -4302,7 +4302,8 @@ int cmake::Build(const std::string& dir, const std::string& target, const std::string& config, const std::vector<std::string>& nativeOptions, - bool clean) + bool clean, + cmSystemTools::OutputOption outputflag) { if(!cmSystemTools::FileIsDirectory(dir.c_str())) { @@ -4344,7 +4345,7 @@ 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, outputflag, 0, nativeOptions); } |