Color output when running moc

Alex

2 files changed, 23 insertions, 8 deletions

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 2add7c0..6e8c77e 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -4,14 +4,31 @@
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
 
+# include <cmsys/Terminal.h>
+
 #include "cmQtAutomoc.h"
 
 
 cmQtAutomoc::cmQtAutomoc()
 :Verbose(cmsys::SystemTools::GetEnv("VERBOSE") != 0)
+,ColorOutput(true)
 ,RunMocFailed(false)
 ,GenerateAll(false)
 {
+
+  std::string colorEnv = "";
+  cmsys::SystemTools::GetEnv("COLOR", colorEnv);
+  if(!colorEnv.empty())
+    {
+    if(cmSystemTools::IsOn(colorEnv.c_str()))
+      {
+      this->ColorOutput = true;
+      }
+    else
+      {
+      this->ColorOutput = false;
+      }
+    }
 }
 
 
@@ -678,14 +695,11 @@ bool cmQtAutomoc::GenerateMoc(const std::string& sourceFile,
       cmsys::SystemTools::MakeDirectory(mocDir.c_str());
       }
 
-/*    if (this->Verbose)
-      {
-      echoColor("Generating " + mocFilePath + " from " + sourceFile);
-      }
-    else
-      {
-      echoColor("Generating " + mocFileName);
-      }*/
+    std::string msg = "Generating ";
+    msg += mocFileName;
+    cmSystemTools::MakefileColorEcho(cmsysTerminal_Color_ForegroundBlue
+                                           |cmsysTerminal_Color_ForegroundBold,
+                                     msg.c_str(), true, this->ColorOutput);
 
     std::vector<cmStdString> command;
     command.push_back(this->MocExecutable);
diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h
index edb66f0..af77366 100644
--- a/Source/cmQtAutomoc.h
+++ b/Source/cmQtAutomoc.h
@@ -61,6 +61,7 @@ private:
   std::list<std::string> MocDefinitions;
 
   bool Verbose;
+  bool ColorOutput;
   bool RunMocFailed;
   bool GenerateAll;