[Cmake-commits] [cmake-commits] zach.mullen committed cmDocumentation.cxx 1.76 1.77 cmDocumentation.h 1.36 1.37 ctest.cxx 1.112 1.113

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv29699

Modified Files:
	cmDocumentation.cxx cmDocumentation.h ctest.cxx 
Log Message:
BUG 9961: ctest --help should not display a Generators section


Index: cmDocumentation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDocumentation.cxx,v
retrieving revision 1.76
retrieving revision 1.77
diff -C 2 -d -r1.76 -r1.77
*** cmDocumentation.cxx	28 Sep 2009 15:42:23 -0000	1.76
--- cmDocumentation.cxx	24 Nov 2009 16:46:05 -0000	1.77
***************
*** 268,271 ****
--- 268,273 ----
    this->VariableSections.push_back("Variables that Control the Build");
    this->VariableSections.push_back("Variables for Languages");
+ 
+   this->ShowGenerators = true;
  }
  
***************
*** 1280,1284 ****
    this->AddSectionToPrint("Usage");
    this->AddSectionToPrint("Options");
!   this->AddSectionToPrint("Generators");
    this->Print(os);
    return true;
--- 1282,1289 ----
    this->AddSectionToPrint("Usage");
    this->AddSectionToPrint("Options");
!   if(this->ShowGenerators)
!     {
!     this->AddSectionToPrint("Generators");
!     }
    this->Print(os);
    return true;

Index: cmDocumentation.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDocumentation.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** cmDocumentation.h	28 Sep 2009 15:42:23 -0000	1.36
--- cmDocumentation.h	24 Nov 2009 16:46:06 -0000	1.37
***************
*** 58,61 ****
--- 58,63 ----
    /** Print help of the given type.  */
    bool PrintDocumentation(Type ht, std::ostream& os, const char* docname=0);
+ 
+   void SetShowGenerators(bool showGen) { this->ShowGenerators = showGen; }
    
    /** Set the program name for standard document generation.  */
***************
*** 160,163 ****
--- 162,167 ----
    bool IsOption(const char* arg) const;
  
+   bool ShowGenerators;
+ 
    std::string NameString;
    std::string DocName;

Index: ctest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/ctest.cxx,v
retrieving revision 1.112
retrieving revision 1.113
diff -C 2 -d -r1.112 -r1.113
*** ctest.cxx	5 Nov 2009 20:25:24 -0000	1.112
--- ctest.cxx	24 Nov 2009 16:46:06 -0000	1.113
***************
*** 280,283 ****
--- 280,284 ----
        ch->GetCommandDocumentation(commands);
  
+       doc.SetShowGenerators(false);
        doc.SetName("ctest");
        doc.SetSection("Name",cmDocumentationName);