diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-22 13:07:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-22 13:07:23 (GMT) |
| commit | 61de941ad74aa6da651015acd77d87b299fc5a49 (patch) | |
| tree | dc861503ed173d2111160ae17adab28fa217a155 /Source/cmake.cxx | |
| parent | 6384f1683ab49890fad9a6b60bdbcaafd0bc2df7 (diff) | |
| parent | bcd5de775a412881e28c4c58f1d6ce535135e97f (diff) | |
| download | CMake-61de941ad74aa6da651015acd77d87b299fc5a49.zip CMake-61de941ad74aa6da651015acd77d87b299fc5a49.tar.gz CMake-61de941ad74aa6da651015acd77d87b299fc5a49.tar.bz2 | |
Merge topic 'cmake--build-pipes'
bcd5de7 cmake: Always pass through stdout/stderr in --build mode
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 9c79516..6822fe1 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2871,8 +2871,7 @@ int cmake::Build(const std::string& dir, const std::string& target, const std::string& config, const std::vector<std::string>& nativeOptions, - bool clean, - cmSystemTools::OutputOption outputflag) + bool clean) { if(!cmSystemTools::FileIsDirectory(dir.c_str())) { @@ -2914,7 +2913,8 @@ int cmake::Build(const std::string& dir, projName.c_str(), target.c_str(), &output, makeProgram.c_str(), - config.c_str(), clean, false, 0, outputflag, + config.c_str(), clean, false, 0, + cmSystemTools::OUTPUT_PASSTHROUGH, 0, nativeOptions); } |