瀏覽代碼

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.
Brad King 12 年之前
父節點
當前提交
bcd5de775a
共有 4 個文件被更改,包括 8 次插入16 次删除
  1. 1 4
      Help/manual/cmake.1.rst
  2. 3 3
      Source/cmake.cxx
  3. 1 2
      Source/cmake.h
  4. 3 7
      Source/cmakemain.cxx

+ 1 - 4
Help/manual/cmake.1.rst

@@ -64,10 +64,7 @@ native tool on their platform.
     --config <cfg> = For multi-configuration tools, choose <cfg>.
     --config <cfg> = For multi-configuration tools, choose <cfg>.
     --clean-first  = Build target 'clean' first, then build.
     --clean-first  = Build target 'clean' first, then build.
                      (To clean only, use --target 'clean'.)
                      (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.
     --             = Pass remaining options to the native tool.
 
 
   Run cmake --build with no options for quick help.
   Run cmake --build with no options for quick help.

+ 3 - 3
Source/cmake.cxx

@@ -2875,8 +2875,7 @@ int cmake::Build(const std::string& dir,
                  const std::string& target,
                  const std::string& target,
                  const std::string& config,
                  const std::string& config,
                  const std::vector<std::string>& nativeOptions,
                  const std::vector<std::string>& nativeOptions,
-                 bool clean,
-                 cmSystemTools::OutputOption outputflag)
+                 bool clean)
 {
 {
   if(!cmSystemTools::FileIsDirectory(dir.c_str()))
   if(!cmSystemTools::FileIsDirectory(dir.c_str()))
     {
     {
@@ -2918,7 +2917,8 @@ int cmake::Build(const std::string& dir,
                     projName.c_str(), target.c_str(),
                     projName.c_str(), target.c_str(),
                     &output,
                     &output,
                     makeProgram.c_str(),
                     makeProgram.c_str(),
-                    config.c_str(), clean, false, 0, outputflag,
+                    config.c_str(), clean, false, 0,
+                    cmSystemTools::OUTPUT_PASSTHROUGH,
                     0, nativeOptions);
                     0, nativeOptions);
 }
 }
 
 

+ 1 - 2
Source/cmake.h

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

+ 3 - 7
Source/cmakemain.cxx

@@ -50,10 +50,7 @@ static const char * cmDocumentationUsage[][2] =
   "  --config <cfg> = For multi-configuration tools, choose <cfg>.\n"   \
   "  --config <cfg> = For multi-configuration tools, choose <cfg>.\n"   \
   "  --clean-first  = Build target 'clean' first, then build.\n"        \
   "  --clean-first  = Build target 'clean' first, then build.\n"        \
   "                   (To clean only, use --target 'clean'.)\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"
   "  --             = Pass remaining options to the native tool.\n"
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -372,7 +369,6 @@ static int do_build(int ac, char** av)
   std::string dir;
   std::string dir;
   std::vector<std::string> nativeOptions;
   std::vector<std::string> nativeOptions;
   bool clean = false;
   bool clean = false;
-  cmSystemTools::OutputOption outputflag = cmSystemTools::OUTPUT_MERGE;
 
 
   enum Doing { DoingNone, DoingDir, DoingTarget, DoingConfig, DoingNative};
   enum Doing { DoingNone, DoingDir, DoingTarget, DoingConfig, DoingNative};
   Doing doing = DoingDir;
   Doing doing = DoingDir;
@@ -397,7 +393,7 @@ static int do_build(int ac, char** av)
       }
       }
     else if(strcmp(av[i], "--use-stderr") == 0)
     else if(strcmp(av[i], "--use-stderr") == 0)
       {
       {
-      outputflag = cmSystemTools::OUTPUT_PASSTHROUGH;
+      /* tolerate legacy option */
       }
       }
     else if(strcmp(av[i], "--") == 0)
     else if(strcmp(av[i], "--") == 0)
       {
       {
@@ -444,6 +440,6 @@ static int do_build(int ac, char** av)
     }
     }
 
 
   cmake cm;
   cmake cm;
-  return cm.Build(dir, target, config, nativeOptions, clean, outputflag);
+  return cm.Build(dir, target, config, nativeOptions, clean);
 #endif
 #endif
 }
 }