ENH: fix module documenation to handle bad docs and fix qt3 docs

2 files changed, 18 insertions, 15 deletions

diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index f1230e63f9..78267ca9fa 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -1,18 +1,19 @@
 # - Locate Qt include paths and libraries
-
-# This module defines
-#  QT_INCLUDE_DIR, where to find qt.h, etc.
-#  QT_LIBRARIES, the libraries to link against to use Qt.
-#  QT_DEFINITIONS, definitions to use when compiling code that uses Qt.
-#  QT_FOUND, If false, don't try to use Qt.
-
-# if you need the multithreaded version of Qt, set QT_MT_REQUIRED to TRUE
-
-# also defined, but not for general use are
+# This module defines:
+#  QT_INCLUDE_DIR - where to find qt.h, etc.
+#  QT_LIBRARIES   - the libraries to link against to use Qt.
+#  QT_DEFINITIONS - definitions to use when 
+#                   compiling code that uses Qt.
+#  QT_FOUND       - If false, don't try to use Qt.
+#
+# If you need the multithreaded version of Qt, set QT_MT_REQUIRED to TRUE
+#
+# Also defined, but not for general use are:
 #  QT_MOC_EXECUTABLE, where to find the moc tool.
 #  QT_UIC_EXECUTABLE, where to find the uic tool.
 #  QT_QT_LIBRARY, where to find the Qt library.
-#  QT_QTMAIN_LIBRARY, where to find the qtmain library. This is only required by Qt3 on Windows.
+#  QT_QTMAIN_LIBRARY, where to find the qtmain 
+#   library. This is only required by Qt3 on Windows.
 
 # These are around for backwards compatibility 
 # they will be set
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 74aadf572b..079b1dabf5 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -309,8 +309,9 @@ bool cmDocumentation::CreateSingleModule(const char* fname, const char* moduleNa
       }
     else
       {
-      if(text.length() < 2)
+      if(text.length() < 2 && brief.length() == 0)
         {
+        std::cerr  << text << " " << brief << "\n";
         return false;
         }
       char* pname = strcpy(new char[strlen(moduleName)+1], moduleName);
@@ -321,7 +322,7 @@ bool cmDocumentation::CreateSingleModule(const char* fname, const char* moduleNa
       this->ModuleStrings.push_back(pbrief);
       cmDocumentationEntry e = { pname, pbrief, ptext };
       this->ModulesSection.push_back(e);
-      return false;
+      return true;
       }
     }
   return true;
@@ -1001,9 +1002,10 @@ bool cmDocumentation::PrintDocumentationSingleModule(std::ostream& os)
   cmakeModules += "/Modules/";
   cmakeModules += this->SingleModuleName;
   cmakeModules += ".cmake";
-  if(cmSystemTools::FileExists(cmakeModules.c_str()))
+  if(cmSystemTools::FileExists(cmakeModules.c_str())
+     && this->CreateSingleModule(cmakeModules.c_str(), 
+                                 this->SingleModuleName.c_str()))
     {
-    this->CreateSingleModule(cmakeModules.c_str(), this->SingleModuleName.c_str());
     this->PrintDocumentationCommand(os, &this->ModulesSection[0]);
     return true;
     }