ENH: merge changes from main trunk

Source/cmLocalUnixMakefileGenerator3.h

@@ -51,18 +51,6 @@ public:
   virtual void Generate();
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   // this returns the relative path between the HomeOutputDirectory and this
   // local generators StartOutputDirectory
   const std::string &GetHomeRelativeOutputPath();
@@ -135,6 +123,15 @@ public:
    */
   void SetSilentNoColon(bool v)  {this->SilentNoColon = v;}
 
+  /**
+   * If set to true, the CMake variable CMAKE_VERBOSE_MAKEFILES doesn't have
+   * 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.
+   */
+  void SetForceVerboseMakefiles(bool enable) 
+    {this->ForceVerboseMakefiles=enable;}
+
   /**
    * Set the command to use for native make shell echo.  The value
    * should include all parts of the command up to the beginning of
@@ -267,19 +264,6 @@ protected:
   void WriteDirectoryInformationFile();
 
 
-  
-
-
-
-
-
-
-
-
-
-
-
-
   // write the depend info 
   void WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &tgt);