kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmake--build-pipes' 

bcd5de7 cmake: Always pass through stdout/stderr in --build mode
This commit is contained in:
Brad King 2013-10-22 09:07:23 -04:00 committed by CMake Topic Stage
parent 6384f1683a bcd5de775a
commit 61de941ad7
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Help/manual/cmake.1.rst
View File

@ -58,10 +58,7 @@ native tool on their platform.
--config <cfg> = For multi-configuration tools, choose <cfg>.
--clean-first = Build target 'clean' first, then build.
(To clean only, use --target 'clean'.)
--use-stderr = Don't merge stdout/stderr output and pass the
original stdout/stderr handles to the native
tool so it can use the capabilities of the
calling terminal (e.g. colored output).
--use-stderr = Ignored. Behavior is default in CMake >= 3.0.
-- = Pass remaining options to the native tool.
Run cmake --build with no options for quick help.

6
Source/cmake.cxx
View File

@ -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);
}

3
Source/cmake.h
View File

@ -362,8 +362,7 @@ class cmake
const std::string& target,
const std::string& config,
const std::vector<std::string>& nativeOptions,
bool clean,
cmSystemTools::OutputOption outputflag);
bool clean);
void UnwatchUnusedCli(const char* var);
void WatchUnusedCli(const char* var);

10
Source/cmakemain.cxx
View File

@ -49,10 +49,7 @@ static const char * cmDocumentationUsage[][2] =
" --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 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" \
" --use-stderr = Ignored. Behavior is default in CMake >= 3.0.\n" \
" -- = Pass remaining options to the native tool.\n"
//----------------------------------------------------------------------------
@ -368,7 +365,6 @@ static int do_build(int ac, char** av)
std::string dir;
std::vector<std::string> nativeOptions;
bool clean = false;
cmSystemTools::OutputOption outputflag = cmSystemTools::OUTPUT_MERGE;
enum Doing { DoingNone, DoingDir, DoingTarget, DoingConfig, DoingNative};
Doing doing = DoingDir;
@ -393,7 +389,7 @@ static int do_build(int ac, char** av)
}
else if(strcmp(av[i], "--use-stderr") == 0)
{
outputflag = cmSystemTools::OUTPUT_PASSTHROUGH;
/* tolerate legacy option */
}
else if(strcmp(av[i], "--") == 0)
{
@ -440,6 +436,6 @@ static int do_build(int ac, char** av)
}
cmake cm;
return cm.Build(dir, target, config, nativeOptions, clean, outputflag);
return cm.Build(dir, target, config, nativeOptions, clean);
#endif
}