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

Don't disable colors in the CodeBlocks generator and minor cleanup.

Browse Source 
Since now the only users of SetToolSupportsColor() are gone, this
method is removed too.

Alex
This commit is contained in:
Alex Neundorf 2010-11-11 22:13:39 +01:00
parent e547fa763b
commit 156ae39905
5 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -63,15 +63,6 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
} }
void cmExtraCodeBlocksGenerator::SetGlobalGenerator(
cmGlobalGenerator* generator)
{
cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator);
cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*)
generator;
mf->SetToolSupportsColor(false);
}
void cmExtraCodeBlocksGenerator::Generate() void cmExtraCodeBlocksGenerator::Generate()
{ {
// for each sub project in the project create a codeblocks project // for each sub project in the project create a codeblocks project

1
Source/cmExtraCodeBlocksGenerator.h
View File

@ -27,7 +27,6 @@ class cmExtraCodeBlocksGenerator : public cmExternalMakefileProjectGenerator
{ {
public: public:
cmExtraCodeBlocksGenerator(); cmExtraCodeBlocksGenerator();
virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
virtual const char* GetName() const virtual const char* GetName() const
{ return cmExtraCodeBlocksGenerator::GetActualName();} { return cmExtraCodeBlocksGenerator::GetActualName();}

10
Source/cmExtraEclipseCDT4Generator.cxx
View File

@ -51,16 +51,6 @@ void cmExtraEclipseCDT4Generator
"the default make target. A \"make install\" target is also provided."; "the default make target. A \"make install\" target is also provided.";
} }
//----------------------------------------------------------------------------
void cmExtraEclipseCDT4Generator
::SetGlobalGenerator(cmGlobalGenerator* generator)
{
cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator);
cmGlobalUnixMakefileGenerator3* mf
= static_cast<cmGlobalUnixMakefileGenerator3*>(generator);
mf->SetToolSupportsColor(true);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmExtraEclipseCDT4Generator::Generate() void cmExtraEclipseCDT4Generator::Generate()
{ {

2
Source/cmExtraEclipseCDT4Generator.h
View File

@ -40,8 +40,6 @@ public:
virtual void GetDocumentation(cmDocumentationEntry& entry, virtual void GetDocumentation(cmDocumentationEntry& entry,
const char* fullName) const; const char* fullName) const;
virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
virtual void Generate(); virtual void Generate();
private: private:

1
Source/cmGlobalGenerator.h
View File

@ -161,7 +161,6 @@ public:
bool GetForceUnixPaths() {return this->ForceUnixPaths;} bool GetForceUnixPaths() {return this->ForceUnixPaths;}
bool GetToolSupportsColor() { return this->ToolSupportsColor; } bool GetToolSupportsColor() { return this->ToolSupportsColor; }
void SetToolSupportsColor(bool enable) { this->ToolSupportsColor = enable; }
///! return the language for the given extension ///! return the language for the given extension
const char* GetLanguageFromExtension(const char* ext); const char* GetLanguageFromExtension(const char* ext);