diff options
| author | Johan Björk <phb@spotify.com> | 2011-07-26 07:36:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-07-28 14:43:09 (GMT) |
| commit | 642f10066a5c9b33e8736b9ca013a44023c21b2c (patch) | |
| tree | c6e63fd944f9e04b588009c67148d75ca5b3b5d0 /Source/cmake.cxx | |
| parent | 856a9e499f299a33cb4f763bf36a75524a03e4f5 (diff) | |
| download | CMake-642f10066a5c9b33e8736b9ca013a44023c21b2c.zip CMake-642f10066a5c9b33e8736b9ca013a44023c21b2c.tar.gz CMake-642f10066a5c9b33e8736b9ca013a44023c21b2c.tar.bz2 | |
RunSingleCommand: Add a OUTPUT_NORMAL flag.
OUTPUT_NORMAL does no processing of the output streams, it just passes
them through the same streams as they were received on.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 3473d91..137665d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -4296,7 +4296,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())) { @@ -4338,8 +4339,7 @@ int cmake::Build(const std::string& dir, projName.c_str(), target.c_str(), &output, makeProgram.c_str(), - config.c_str(), clean, false, 0, - cmSystemTools::OUTPUT_MERGE, + config.c_str(), clean, false, 0, outputflag, 0, nativeOptions); } |