Merge pull request #157 from jmirabel/devel

Fix generation of XML documentation. 

CMakeLists.txt

@@ -148,6 +148,7 @@ SET(${PROJECT_NAME}_HEADERS
   include/hpp/fcl/internal/traversal.h
   )
 
+add_subdirectory(doc)
 add_subdirectory(src)
 if (BUILD_PYTHON_INTERFACE)
   add_subdirectory(python)

cmake @ dcec7d7b

-Subproject commit 078c4aee2d9d6c50007d587480b3e13dd1cca0bd
+Subproject commit dcec7d7b7a358f3b638b033f6be13273a0d0c6b3

doc/CMakeLists.txt

+SET(DOXYGEN_XML_OUTPUT          "doxygen-xml"      PARENT_SCOPE)
+SET(DOXYGEN_FILE_PATTERNS       "*.h  *.hh  *.hxx" PARENT_SCOPE)
+SET(DOXYGEN_GENERATE_XML        "YES"              PARENT_SCOPE)
+SET(DOXYGEN_EXPAND_ONLY_PREDEF  "NO"               PARENT_SCOPE)

doc/Doxyfile.extra.in

-FILE_PATTERNS          = *.h  *.hh  *.hxx
-GENERATE_XML           = YES
-EXPAND_ONLY_PREDEF     = NO

doc/python/doxygen_xml_parser.py

@@ -417,6 +417,9 @@ class ClassCompound (CompoundBase):
             return
 
         include = self.definition.find('includes')
+        if include is None:
+            output.err("Does not know where to write doc of", self.name)
+            return
         output.open (include.text)
         output.out (template_include_extern.format (filename=include.text))
         output.out (template_open_namespace.format (namespace="doxygen"))