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

Color output when running moc 

Alex
This commit is contained in:
Alex Neundorf 2011-08-14 16:43:04 +02:00
parent 93032953af
commit ddb517d014
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/cmQtAutomoc.cxx
View File

@ -4,14 +4,31 @@
#include "cmSourceFile.h" #include "cmSourceFile.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
# include <cmsys/Terminal.h>
#include "cmQtAutomoc.h" #include "cmQtAutomoc.h"
cmQtAutomoc::cmQtAutomoc() cmQtAutomoc::cmQtAutomoc()
:Verbose(cmsys::SystemTools::GetEnv("VERBOSE") != 0) :Verbose(cmsys::SystemTools::GetEnv("VERBOSE") != 0)
,ColorOutput(true)
,RunMocFailed(false) ,RunMocFailed(false)
,GenerateAll(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()); cmsys::SystemTools::MakeDirectory(mocDir.c_str());
} }
/* if (this->Verbose) std::string msg = "Generating ";
{ msg += mocFileName;
echoColor("Generating " + mocFilePath + " from " + sourceFile); cmSystemTools::MakefileColorEcho(cmsysTerminal_Color_ForegroundBlue
} |cmsysTerminal_Color_ForegroundBold,
else msg.c_str(), true, this->ColorOutput);
{
echoColor("Generating " + mocFileName);
}*/
std::vector<cmStdString> command; std::vector<cmStdString> command;
command.push_back(this->MocExecutable); command.push_back(this->MocExecutable);

1
Source/cmQtAutomoc.h
View File

@ -61,6 +61,7 @@ private:
std::list<std::string> MocDefinitions; std::list<std::string> MocDefinitions;
bool Verbose; bool Verbose;
bool ColorOutput;
bool RunMocFailed; bool RunMocFailed;
bool GenerateAll; bool GenerateAll;