diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-31 12:48:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-31 12:48:19 (GMT) |
| commit | 6e2da4a4d3a34f62ec830720ab47d344ada73441 (patch) | |
| tree | cfa3106ec0fdfe8a8eeaf16e4a34f3f0d33b082e /Source/cmakemain.cxx | |
| parent | 8e475470bec1761b9ab338f495e33b145e0ff22e (diff) | |
| parent | 2b473d2eaa2d09a69fc5a4f37d24ad051d5ead9a (diff) | |
| download | CMake-6e2da4a4d3a34f62ec830720ab47d344ada73441.zip CMake-6e2da4a4d3a34f62ec830720ab47d344ada73441.tar.gz CMake-6e2da4a4d3a34f62ec830720ab47d344ada73441.tar.bz2 | |
Merge topic 'passthru'
2b473d2 Add option to use stdout/stderr of original terminal in cmake --build
Diffstat (limited to 'Source/cmakemain.cxx')
| -rw-r--r-- | Source/cmakemain.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index f3553f1..68d8339 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -62,7 +62,10 @@ static const char * cmDocumentationDescription[][3] = " --config <cfg> = For multi-configuration tools, choose <cfg>.\n" \ " --clean-first = Build target 'clean' first, then build.\n" \ " (To clean only, use --target 'clean'.)\n" \ - " --use-stderr = Don't merge stdout/stderr.\n" \ + " --use-stderr = Don't merge stdout/stderr output and pass the\n" \ + " original stdout/stderr handles to the native\n" \ + " tool so it can use the capabilities of the\n" \ + " calling terminal (e.g. colored output).\n" \ " -- = Pass remaining options to the native tool.\n" //---------------------------------------------------------------------------- @@ -606,7 +609,7 @@ static int do_build(int ac, char** av) } else if(strcmp(av[i], "--use-stderr") == 0) { - outputflag = cmSystemTools::OUTPUT_NORMAL; + outputflag = cmSystemTools::OUTPUT_PASSTHROUGH; } else if(strcmp(av[i], "--") == 0) { |