summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-18 17:38:36 (GMT)
committerBrad King <brad.king@kitware.com>2013-10-18 17:45:27 (GMT)
commitbcd5de775a412881e28c4c58f1d6ce535135e97f (patch)
treefd5c044a6656cdd8f7e56de661ab72cbaaf08340 /Source/cmake.cxx
parent919e1e845361d6e29789f5347d12af3318452843 (diff)
downloadCMake-bcd5de775a412881e28c4c58f1d6ce535135e97f.zip
CMake-bcd5de775a412881e28c4c58f1d6ce535135e97f.tar.gz
CMake-bcd5de775a412881e28c4c58f1d6ce535135e97f.tar.bz2
cmake: Always pass through stdout/stderr in --build mode
Enable the --use-stderr behavior by default and ignore the old option. Passing through the pipes allows color terminal output and other things to work as if one ran the native build command directly.
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d11a40b..dc3a168 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2875,8 +2875,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()))
{
@@ -2918,7 +2917,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);
}