|
|
@@ -50,10 +50,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"
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
@@ -372,7 +369,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;
|
|
|
@@ -397,7 +393,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)
|
|
|
{
|
|
|
@@ -444,6 +440,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
|
|
|
}
|