Просмотр исходного кода

Make cmGlobalGenerator::GetDocumentation() a static function

Making the function static allows us to call it directly,
without creating and removing an instance of the generator.
Patrick Gansterer 13 лет назад
Родитель
Сommit
5170a8800f
49 измененных файлов с 70 добавлено и 82 удалено
  1. 2 2
      Source/cmGlobalBorlandMakefileGenerator.cxx
  2. 1 1
      Source/cmGlobalBorlandMakefileGenerator.h
  3. 0 8
      Source/cmGlobalGenerator.cxx
  4. 0 3
      Source/cmGlobalGenerator.h
  5. 1 1
      Source/cmGlobalGeneratorFactory.h
  6. 2 2
      Source/cmGlobalJOMMakefileGenerator.cxx
  7. 1 1
      Source/cmGlobalJOMMakefileGenerator.h
  8. 2 2
      Source/cmGlobalMSYSMakefileGenerator.cxx
  9. 1 1
      Source/cmGlobalMSYSMakefileGenerator.h
  10. 2 2
      Source/cmGlobalMinGWMakefileGenerator.cxx
  11. 1 1
      Source/cmGlobalMinGWMakefileGenerator.h
  12. 2 2
      Source/cmGlobalNMakeMakefileGenerator.cxx
  13. 1 1
      Source/cmGlobalNMakeMakefileGenerator.h
  14. 2 2
      Source/cmGlobalNinjaGenerator.cxx
  15. 1 1
      Source/cmGlobalNinjaGenerator.h
  16. 2 2
      Source/cmGlobalUnixMakefileGenerator3.cxx
  17. 1 1
      Source/cmGlobalUnixMakefileGenerator3.h
  18. 2 2
      Source/cmGlobalVisualStudio10Generator.cxx
  19. 1 1
      Source/cmGlobalVisualStudio10Generator.h
  20. 2 2
      Source/cmGlobalVisualStudio10IA64Generator.cxx
  21. 1 1
      Source/cmGlobalVisualStudio10IA64Generator.h
  22. 2 2
      Source/cmGlobalVisualStudio10Win64Generator.cxx
  23. 1 1
      Source/cmGlobalVisualStudio10Win64Generator.h
  24. 2 2
      Source/cmGlobalVisualStudio11ARMGenerator.cxx
  25. 1 1
      Source/cmGlobalVisualStudio11ARMGenerator.h
  26. 2 2
      Source/cmGlobalVisualStudio11Generator.cxx
  27. 1 1
      Source/cmGlobalVisualStudio11Generator.h
  28. 2 2
      Source/cmGlobalVisualStudio11Win64Generator.cxx
  29. 1 1
      Source/cmGlobalVisualStudio11Win64Generator.h
  30. 2 2
      Source/cmGlobalVisualStudio6Generator.cxx
  31. 1 1
      Source/cmGlobalVisualStudio6Generator.h
  32. 2 2
      Source/cmGlobalVisualStudio71Generator.cxx
  33. 1 1
      Source/cmGlobalVisualStudio71Generator.h
  34. 2 2
      Source/cmGlobalVisualStudio7Generator.cxx
  35. 1 1
      Source/cmGlobalVisualStudio7Generator.h
  36. 2 2
      Source/cmGlobalVisualStudio8Generator.cxx
  37. 1 1
      Source/cmGlobalVisualStudio8Generator.h
  38. 2 2
      Source/cmGlobalVisualStudio8Win64Generator.cxx
  39. 1 1
      Source/cmGlobalVisualStudio8Win64Generator.h
  40. 2 2
      Source/cmGlobalVisualStudio9Generator.cxx
  41. 1 1
      Source/cmGlobalVisualStudio9Generator.h
  42. 2 2
      Source/cmGlobalVisualStudio9IA64Generator.cxx
  43. 1 1
      Source/cmGlobalVisualStudio9IA64Generator.h
  44. 2 2
      Source/cmGlobalVisualStudio9Win64Generator.cxx
  45. 1 1
      Source/cmGlobalVisualStudio9Win64Generator.h
  46. 2 2
      Source/cmGlobalWatcomWMakeGenerator.cxx
  47. 1 1
      Source/cmGlobalWatcomWMakeGenerator.h
  48. 2 3
      Source/cmGlobalXCodeGenerator.cxx
  49. 1 1
      Source/cmGlobalXCodeGenerator.h

+ 2 - 2
Source/cmGlobalBorlandMakefileGenerator.cxx

@@ -55,9 +55,9 @@ cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalBorlandMakefileGenerator
 void cmGlobalBorlandMakefileGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalBorlandMakefileGenerator::GetActualName();
   entry.Brief = "Generates Borland makefiles.";
   entry.Brief = "Generates Borland makefiles.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalBorlandMakefileGenerator.h

@@ -33,7 +33,7 @@ public:
   static const char* GetActualName() {return "Borland Makefiles";}
   static const char* GetActualName() {return "Borland Makefiles";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 0 - 8
Source/cmGlobalGenerator.cxx

@@ -1555,14 +1555,6 @@ void cmGlobalGenerator::SetConfiguredFilesPath(cmGlobalGenerator* gen)
     }
     }
 }
 }
 
 
-//----------------------------------------------------------------------------
-void cmGlobalGenerator::GetDocumentation(cmDocumentationEntry& entry) const
-{
-  entry.Name = this->GetName();
-  entry.Brief = "";
-  entry.Full = "";
-}
-
 bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
 bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
                                    cmLocalGenerator* gen)
                                    cmLocalGenerator* gen)
 {
 {

+ 0 - 3
Source/cmGlobalGenerator.h

@@ -49,9 +49,6 @@ public:
   ///! Get the name for this generator
   ///! Get the name for this generator
   virtual const char *GetName() const { return "Generic"; };
   virtual const char *GetName() const { return "Generic"; };
 
 
-  /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
-
   /**
   /**
    * Create LocalGenerators and process the CMakeLists files. This does not
    * Create LocalGenerators and process the CMakeLists files. This does not
    * actually produce any makefiles, DSPs, etc.
    * actually produce any makefiles, DSPs, etc.

+ 1 - 1
Source/cmGlobalGeneratorFactory.h

@@ -49,7 +49,7 @@ public:
 
 
   /** Get the documentation entry for this factory */
   /** Get the documentation entry for this factory */
   virtual void GetDocumentation(cmDocumentationEntry& entry) const {
   virtual void GetDocumentation(cmDocumentationEntry& entry) const {
-    T().GetDocumentation(entry); }
+    T::GetDocumentation(entry); }
 
 
   /** Get the names of the current registered generators */
   /** Get the names of the current registered generators */
   virtual void GetGenerators(std::vector<std::string>& names) const {
   virtual void GetGenerators(std::vector<std::string>& names) const {

+ 2 - 2
Source/cmGlobalJOMMakefileGenerator.cxx

@@ -61,9 +61,9 @@ cmLocalGenerator *cmGlobalJOMMakefileGenerator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalJOMMakefileGenerator
 void cmGlobalJOMMakefileGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalJOMMakefileGenerator::GetActualName();
   entry.Brief = "Generates JOM makefiles.";
   entry.Brief = "Generates JOM makefiles.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalJOMMakefileGenerator.h

@@ -34,7 +34,7 @@ public:
   static const char* GetActualName() {return "NMake Makefiles JOM";}
   static const char* GetActualName() {return "NMake Makefiles JOM";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalMSYSMakefileGenerator.cxx

@@ -106,9 +106,9 @@ cmLocalGenerator *cmGlobalMSYSMakefileGenerator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalMSYSMakefileGenerator
 void cmGlobalMSYSMakefileGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalMSYSMakefileGenerator::GetActualName();
   entry.Brief = "Generates MSYS makefiles.";
   entry.Brief = "Generates MSYS makefiles.";
   entry.Full = "The makefiles use /bin/sh as the shell.  "
   entry.Full = "The makefiles use /bin/sh as the shell.  "
     "They require msys to be installed on the machine.";
     "They require msys to be installed on the machine.";

+ 1 - 1
Source/cmGlobalMSYSMakefileGenerator.h

@@ -33,7 +33,7 @@ public:
   static const char* GetActualName() {return "MSYS Makefiles";}
   static const char* GetActualName() {return "MSYS Makefiles";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalMinGWMakefileGenerator.cxx

@@ -71,9 +71,9 @@ cmLocalGenerator *cmGlobalMinGWMakefileGenerator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalMinGWMakefileGenerator
 void cmGlobalMinGWMakefileGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalMinGWMakefileGenerator::GetActualName();
   entry.Brief = "Generates a make file for use with mingw32-make.";
   entry.Brief = "Generates a make file for use with mingw32-make.";
   entry.Full = "The makefiles generated use cmd.exe as the shell.  "
   entry.Full = "The makefiles generated use cmd.exe as the shell.  "
     "They do not require msys or a unix shell.";
     "They do not require msys or a unix shell.";

+ 1 - 1
Source/cmGlobalMinGWMakefileGenerator.h

@@ -32,7 +32,7 @@ public:
   static const char* GetActualName() {return "MinGW Makefiles";}
   static const char* GetActualName() {return "MinGW Makefiles";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalNMakeMakefileGenerator.cxx

@@ -61,9 +61,9 @@ cmLocalGenerator *cmGlobalNMakeMakefileGenerator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalNMakeMakefileGenerator
 void cmGlobalNMakeMakefileGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalNMakeMakefileGenerator::GetActualName();
   entry.Brief = "Generates NMake makefiles.";
   entry.Brief = "Generates NMake makefiles.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalNMakeMakefileGenerator.h

@@ -32,7 +32,7 @@ public:
   static const char* GetActualName() {return "NMake Makefiles";}
   static const char* GetActualName() {return "NMake Makefiles";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalNinjaGenerator.cxx

@@ -452,9 +452,9 @@ cmLocalGenerator* cmGlobalNinjaGenerator::CreateLocalGenerator()
 }
 }
 
 
 void cmGlobalNinjaGenerator
 void cmGlobalNinjaGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalNinjaGenerator::GetActualName();
   entry.Brief = "Generates build.ninja files (experimental).";
   entry.Brief = "Generates build.ninja files (experimental).";
   entry.Full =
   entry.Full =
     "A build.ninja file is generated into the build tree. Recent "
     "A build.ninja file is generated into the build tree. Recent "

+ 1 - 1
Source/cmGlobalNinjaGenerator.h

@@ -178,7 +178,7 @@ public:
   static const char* GetActualName() { return "Ninja"; }
   static const char* GetActualName() { return "Ninja"; }
 
 
   /// Overloaded methods. @see cmGlobalGenerator::GetDocumentation()
   /// Overloaded methods. @see cmGlobalGenerator::GetDocumentation()
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   /// Overloaded methods. @see cmGlobalGenerator::Generate()
   /// Overloaded methods. @see cmGlobalGenerator::Generate()
   virtual void Generate();
   virtual void Generate();

+ 2 - 2
Source/cmGlobalUnixMakefileGenerator3.cxx

@@ -61,9 +61,9 @@ cmLocalGenerator *cmGlobalUnixMakefileGenerator3::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalUnixMakefileGenerator3
 void cmGlobalUnixMakefileGenerator3
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalUnixMakefileGenerator3::GetActualName();
   entry.Brief = "Generates standard UNIX makefiles.";
   entry.Brief = "Generates standard UNIX makefiles.";
   entry.Full =
   entry.Full =
     "A hierarchy of UNIX makefiles is generated into the build tree.  Any "
     "A hierarchy of UNIX makefiles is generated into the build tree.  Any "

+ 1 - 1
Source/cmGlobalUnixMakefileGenerator3.h

@@ -65,7 +65,7 @@ public:
   static const char* GetActualName() {return "Unix Makefiles";}
   static const char* GetActualName() {return "Unix Makefiles";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator3
   ///! Create a local generator appropriate to this Global Generator3
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalVisualStudio10Generator.cxx

@@ -88,9 +88,9 @@ void cmGlobalVisualStudio10Generator::Generate()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio10Generator
 void cmGlobalVisualStudio10Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio10Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 10 project files.";
   entry.Brief = "Generates Visual Studio 10 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio10Generator.h

@@ -42,7 +42,7 @@ public:
   virtual void AddPlatformDefinitions(cmMakefile* mf);
   virtual void AddPlatformDefinitions(cmMakefile* mf);
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! create the correct local generator
   ///! create the correct local generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalVisualStudio10IA64Generator.cxx

@@ -21,9 +21,9 @@ cmGlobalVisualStudio10IA64Generator::cmGlobalVisualStudio10IA64Generator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio10IA64Generator
 void cmGlobalVisualStudio10IA64Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio10IA64Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 10 Itanium project files.";
   entry.Brief = "Generates Visual Studio 10 Itanium project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio10IA64Generator.h

@@ -31,7 +31,7 @@ public:
   virtual const char* GetPlatformName() const {return "Itanium";}
   virtual const char* GetPlatformName() const {return "Itanium";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   virtual void AddPlatformDefinitions(cmMakefile* mf);
   virtual void AddPlatformDefinitions(cmMakefile* mf);
 
 

+ 2 - 2
Source/cmGlobalVisualStudio10Win64Generator.cxx

@@ -21,9 +21,9 @@ cmGlobalVisualStudio10Win64Generator::cmGlobalVisualStudio10Win64Generator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio10Win64Generator
 void cmGlobalVisualStudio10Win64Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio10Win64Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 10 Win64 project files.";
   entry.Brief = "Generates Visual Studio 10 Win64 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio10Win64Generator.h

@@ -31,7 +31,7 @@ public:
   virtual const char* GetPlatformName() const {return "x64";}
   virtual const char* GetPlatformName() const {return "x64";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   virtual void AddPlatformDefinitions(cmMakefile* mf);
   virtual void AddPlatformDefinitions(cmMakefile* mf);
 
 

+ 2 - 2
Source/cmGlobalVisualStudio11ARMGenerator.cxx

@@ -21,9 +21,9 @@ cmGlobalVisualStudio11ARMGenerator::cmGlobalVisualStudio11ARMGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio11ARMGenerator
 void cmGlobalVisualStudio11ARMGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio11ARMGenerator::GetActualName();
   entry.Brief = "Generates Visual Studio 11 ARM project files.";
   entry.Brief = "Generates Visual Studio 11 ARM project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio11ARMGenerator.h

@@ -31,6 +31,6 @@ public:
   virtual const char* GetPlatformName() const {return "ARM";}
   virtual const char* GetPlatformName() const {return "ARM";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 };
 };
 #endif
 #endif

+ 2 - 2
Source/cmGlobalVisualStudio11Generator.cxx

@@ -43,9 +43,9 @@ cmLocalGenerator *cmGlobalVisualStudio11Generator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio11Generator
 void cmGlobalVisualStudio11Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio11Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 11 project files.";
   entry.Brief = "Generates Visual Studio 11 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio11Generator.h

@@ -33,7 +33,7 @@ public:
   virtual void WriteSLNHeader(std::ostream& fout);
   virtual void WriteSLNHeader(std::ostream& fout);
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! create the correct local generator
   ///! create the correct local generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalVisualStudio11Win64Generator.cxx

@@ -21,9 +21,9 @@ cmGlobalVisualStudio11Win64Generator::cmGlobalVisualStudio11Win64Generator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio11Win64Generator
 void cmGlobalVisualStudio11Win64Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio11Win64Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 11 Win64 project files.";
   entry.Brief = "Generates Visual Studio 11 Win64 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio11Win64Generator.h

@@ -31,7 +31,7 @@ public:
   virtual const char* GetPlatformName() const {return "x64";}
   virtual const char* GetPlatformName() const {return "x64";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   virtual void AddPlatformDefinitions(cmMakefile* mf);
   virtual void AddPlatformDefinitions(cmMakefile* mf);
 };
 };

+ 2 - 2
Source/cmGlobalVisualStudio6Generator.cxx

@@ -397,9 +397,9 @@ cmGlobalVisualStudio6Generator::WriteUtilityDepend(cmTarget* target)
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio6Generator
 void cmGlobalVisualStudio6Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio6Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 6 project files.";
   entry.Brief = "Generates Visual Studio 6 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio6Generator.h

@@ -36,7 +36,7 @@ public:
   static const char* GetActualName() {return "Visual Studio 6";}
   static const char* GetActualName() {return "Visual Studio 6";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalVisualStudio71Generator.cxx

@@ -313,9 +313,9 @@ void cmGlobalVisualStudio71Generator::WriteSLNHeader(std::ostream& fout)
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio71Generator
 void cmGlobalVisualStudio71Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio71Generator::GetActualName();
   entry.Brief = "Generates Visual Studio .NET 2003 project files.";
   entry.Brief = "Generates Visual Studio .NET 2003 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio71Generator.h

@@ -34,7 +34,7 @@ public:
   static const char* GetActualName() {return "Visual Studio 7 .NET 2003";}
   static const char* GetActualName() {return "Visual Studio 7 .NET 2003";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalVisualStudio7Generator.cxx

@@ -740,9 +740,9 @@ std::vector<std::string> *cmGlobalVisualStudio7Generator::GetConfigurations()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio7Generator
 void cmGlobalVisualStudio7Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio7Generator::GetActualName();
   entry.Brief = "Generates Visual Studio .NET 2002 project files.";
   entry.Brief = "Generates Visual Studio .NET 2002 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio7Generator.h

@@ -40,7 +40,7 @@ public:
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   /**
   /**
    * Try to determine system infomation such as shared library
    * Try to determine system infomation such as shared library

+ 2 - 2
Source/cmGlobalVisualStudio8Generator.cxx

@@ -45,9 +45,9 @@ void cmGlobalVisualStudio8Generator::WriteSLNHeader(std::ostream& fout)
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Generator
 void cmGlobalVisualStudio8Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio8Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 8 2005 project files.";
   entry.Brief = "Generates Visual Studio 8 2005 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio8Generator.h

@@ -36,7 +36,7 @@ public:
   virtual const char* GetPlatformName() const {return "Win32";}
   virtual const char* GetPlatformName() const {return "Win32";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalVisualStudio8Win64Generator.cxx

@@ -24,9 +24,9 @@ cmGlobalVisualStudio8Win64Generator::cmGlobalVisualStudio8Win64Generator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio8Win64Generator
 void cmGlobalVisualStudio8Win64Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio8Win64Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 8 2005 Win64 project files.";
   entry.Brief = "Generates Visual Studio 8 2005 Win64 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio8Win64Generator.h

@@ -37,7 +37,7 @@ public:
   virtual const char* GetPlatformName() const {return "x64";}
   virtual const char* GetPlatformName() const {return "x64";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   /**
   /**
    * Try to determine system infomation such as shared library
    * Try to determine system infomation such as shared library

+ 2 - 2
Source/cmGlobalVisualStudio9Generator.cxx

@@ -42,9 +42,9 @@ cmLocalGenerator *cmGlobalVisualStudio9Generator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio9Generator
 void cmGlobalVisualStudio9Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio9Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 9 2008 project files.";
   entry.Brief = "Generates Visual Studio 9 2008 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio9Generator.h

@@ -35,7 +35,7 @@ public:
   static const char* GetActualName() {return "Visual Studio 9 2008";}
   static const char* GetActualName() {return "Visual Studio 9 2008";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! create the correct local generator
   ///! create the correct local generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 2
Source/cmGlobalVisualStudio9IA64Generator.cxx

@@ -21,9 +21,9 @@ cmGlobalVisualStudio9IA64Generator::cmGlobalVisualStudio9IA64Generator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio9IA64Generator
 void cmGlobalVisualStudio9IA64Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio9IA64Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 9 2008 Itanium project files.";
   entry.Brief = "Generates Visual Studio 9 2008 Itanium project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio9IA64Generator.h

@@ -37,7 +37,7 @@ public:
   virtual const char* GetPlatformName() const {return "Itanium";}
   virtual const char* GetPlatformName() const {return "Itanium";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   /**
   /**
    * Try to determine system infomation such as shared library
    * Try to determine system infomation such as shared library

+ 2 - 2
Source/cmGlobalVisualStudio9Win64Generator.cxx

@@ -21,9 +21,9 @@ cmGlobalVisualStudio9Win64Generator::cmGlobalVisualStudio9Win64Generator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio9Win64Generator
 void cmGlobalVisualStudio9Win64Generator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalVisualStudio9Win64Generator::GetActualName();
   entry.Brief = "Generates Visual Studio 9 2008 Win64 project files.";
   entry.Brief = "Generates Visual Studio 9 2008 Win64 project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalVisualStudio9Win64Generator.h

@@ -37,7 +37,7 @@ public:
   virtual const char* GetPlatformName() const {return "x64";}
   virtual const char* GetPlatformName() const {return "x64";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   /**
   /**
    * Try to determine system infomation such as shared library
    * Try to determine system infomation such as shared library

+ 2 - 2
Source/cmGlobalWatcomWMakeGenerator.cxx

@@ -58,9 +58,9 @@ cmLocalGenerator *cmGlobalWatcomWMakeGenerator::CreateLocalGenerator()
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalWatcomWMakeGenerator
 void cmGlobalWatcomWMakeGenerator
-::GetDocumentation(cmDocumentationEntry& entry) const
+::GetDocumentation(cmDocumentationEntry& entry)
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalWatcomWMakeGenerator::GetActualName();
   entry.Brief = "Generates Watcom WMake makefiles.";
   entry.Brief = "Generates Watcom WMake makefiles.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalWatcomWMakeGenerator.h

@@ -32,7 +32,7 @@ public:
   static const char* GetActualName() {return "Watcom WMake";}
   static const char* GetActualName() {return "Watcom WMake";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();

+ 2 - 3
Source/cmGlobalXCodeGenerator.cxx

@@ -119,7 +119,7 @@ public:
   virtual cmGlobalGenerator* CreateGlobalGenerator(const char* name) const;
   virtual cmGlobalGenerator* CreateGlobalGenerator(const char* name) const;
 
 
   virtual void GetDocumentation(cmDocumentationEntry& entry) const {
   virtual void GetDocumentation(cmDocumentationEntry& entry) const {
-    cmGlobalXCodeGenerator().GetDocumentation(entry); }
+    cmGlobalXCodeGenerator::GetDocumentation(entry); }
 
 
   virtual void GetGenerators(std::vector<std::string>& names) const {
   virtual void GetGenerators(std::vector<std::string>& names) const {
     names.push_back(cmGlobalXCodeGenerator::GetActualName()); }
     names.push_back(cmGlobalXCodeGenerator::GetActualName()); }
@@ -3496,9 +3496,8 @@ const char* cmGlobalXCodeGenerator::GetCMakeCFGIntDir() const
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::GetDocumentation(cmDocumentationEntry& entry)
 void cmGlobalXCodeGenerator::GetDocumentation(cmDocumentationEntry& entry)
-  const
 {
 {
-  entry.Name = this->GetName();
+  entry.Name = cmGlobalXCodeGenerator::GetActualName();
   entry.Brief = "Generate Xcode project files.";
   entry.Brief = "Generate Xcode project files.";
   entry.Full = "";
   entry.Full = "";
 }
 }

+ 1 - 1
Source/cmGlobalXCodeGenerator.h

@@ -38,7 +38,7 @@ public:
   static const char* GetActualName() {return "Xcode";}
   static const char* GetActualName() {return "Xcode";}
 
 
   /** Get the documentation entry for this generator.  */
   /** Get the documentation entry for this generator.  */
-  virtual void GetDocumentation(cmDocumentationEntry& entry) const;
+  static void GetDocumentation(cmDocumentationEntry& entry);
 
 
   ///! Create a local generator appropriate to this Global Generator
   ///! Create a local generator appropriate to this Global Generator
   virtual cmLocalGenerator *CreateLocalGenerator();
   virtual cmLocalGenerator *CreateLocalGenerator();