Merge topic 'MakeCodeBlocksGeneratorNonVerbose2'

156ae39 Don't disable colors in the CodeBlocks generator and minor cleanup.
e547fa7 Remove the "early alpha stage" comments about Eclipse and C::B
a02987a Don't enforce VERBOSE makefiles for the CodeBlocks generator
7b1421b Remove trailing whitespace

Source/cmExtraCodeBlocksGenerator.cxx

@@ -63,16 +63,6 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
 }
 
 
-void cmExtraCodeBlocksGenerator::SetGlobalGenerator(
-                                                  cmGlobalGenerator* generator)
-{
-  cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator);
-  cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*)
-                                                                     generator;
-  mf->SetToolSupportsColor(false);
-  mf->SetForceVerboseMakefiles(true);
-}
-
 void cmExtraCodeBlocksGenerator::Generate()
 {
   // for each sub project in the project create a codeblocks project
@@ -695,6 +685,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
     command += " /NOLOGO /f "";
     command += makefileName;
     command += "" ";
+    command += " VERBOSE=1 ";
     command += target;
     }
   else if (strcmp(this->GlobalGenerator->GetName(), "MinGW Makefiles")==0)
@@ -705,6 +696,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
     command += " -f "";
     command += makefileName;
     command += "" ";
+    command += " VERBOSE=1 ";
     command += target;
     }
   else
@@ -713,6 +705,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
     command += " -f "";
     command += makefileName;
     command += "" ";
+    command += " VERBOSE=1 ";
     command += target;
     }
   return command;

Source/cmExtraCodeBlocksGenerator.h

@@ -22,14 +22,11 @@ class cmGeneratedFileStream;
 
 /** \class cmExtraCodeBlocksGenerator
  * \brief Write CodeBlocks project files for Makefile based projects
- *
- * This generator is in early alpha stage.
  */
 class cmExtraCodeBlocksGenerator : public cmExternalMakefileProjectGenerator
 {
 public:
   cmExtraCodeBlocksGenerator();
-  virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
 
   virtual const char* GetName() const
                          { return cmExtraCodeBlocksGenerator::GetActualName();}

Source/cmExtraEclipseCDT4Generator.cxx

@@ -51,16 +51,6 @@ void cmExtraEclipseCDT4Generator
     "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()
 {

Source/cmExtraEclipseCDT4Generator.h

@@ -21,8 +21,6 @@ class cmGeneratedFileStream;
 
 /** \class cmExtraEclipseCDT4Generator
  * \brief Write Eclipse project files for Makefile based projects
- *
- * This generator is in early alpha stage.
  */
 class cmExtraEclipseCDT4Generator : public cmExternalMakefileProjectGenerator
 {
@@ -42,8 +40,6 @@ public:
   virtual void GetDocumentation(cmDocumentationEntry& entry,
                                 const char*           fullName) const;
 
-  virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
-
   virtual void Generate();
 
 private:

Source/cmGlobalGenerator.h

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

Source/cmGlobalUnixMakefileGenerator3.cxx

@@ -24,7 +24,6 @@ cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3()
   this->ForceUnixPaths = true;
   this->FindMakeProgramFile = "CMakeUnixFindMake.cmake";
   this->ToolSupportsColor = true;
-  this->ForceVerboseMakefiles = false;
   this->NoRuleMessages = false;
 
 #if defined(_WIN32) || defined(__VMS)

Source/cmGlobalUnixMakefileGenerator3.h

@@ -112,16 +112,6 @@ public:
   /** Record per-target progress information.  */
   void RecordTargetProgress(cmMakefileTargetGenerator* tg);
 
-  /**
-   * If true, the CMake variable CMAKE_VERBOSE_MAKEFILES doesn't have effect
-   * anymore. Set it to true when writing a generator where short output
-   * doesn't make sense, e.g. because the full output is parsed by an
-   * IDE/editor.
-   */
-  bool GetForceVerboseMakefiles() { return this->ForceVerboseMakefiles; }
-  void SetForceVerboseMakefiles(bool enable) 
-    {this->ForceVerboseMakefiles=enable;}
-
 protected:
   void WriteMainMakefile2();
   void WriteMainCMakefile();
@@ -169,7 +159,6 @@ protected:
   // in the rule to satisfy the make program.
   std::string EmptyRuleHackCommand;
 
-  bool ForceVerboseMakefiles;
   bool NoRuleMessages;
 
   // Store per-target progress counters.

Source/cmLocalUnixMakefileGenerator3.cxx

@@ -722,8 +722,7 @@ cmLocalUnixMakefileGenerator3
   // "VERBOSE=1" to be added as a make variable which will change the
   // name of this special target.  This gives a make-time choice to
   // the user.
-  if((this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) 
+  if(this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
-     || (gg->GetForceVerboseMakefiles()))
     {
     makefileStream
       << "# Produce verbose output by default.\n"