Merge pull request #159 from Rascof/patch-4

Fix Sphinx warnings and update the package.xml

Author: nim65s

doc/CMakeLists.txt

@@ -6,8 +6,6 @@
 # get the python script install path
 
 IF(BUILD_PYTHON_INTERFACE)
-  SPHINX_SETUP()
-  SPHINX_FINALIZE()
   IF(INSTALL_DOCUMENTATION)
     INSTALL (FILES
       pictures/feature.png

doc/sphinx/conf.py.in

@@ -1,4 +1,5 @@
-<package format="2">
+<?xml version="1.0"?>
+<package format="3">
   <name>sot-core</name>
   <version>4.10.0</version>
   <description>
@@ -14,28 +15,19 @@
   <author>Olivier Stasse</author>
   <author email="ostasse@laas.fr">ostasse@laas.fr</author>
 
-  <buildtool_depend>catkin</buildtool_depend>
-  <build_depend version_gte="1.1" version_lt="2.0">genmsg</build_depend>
-
-  <build_depend>roscpp</build_depend>
-  <build_depend>dynamic-graph-python</build_depend>
-  <build_depend>pinocchio</build_depend>
-
-  <build_depend>roscpp</build_depend>
-  <build_export_depend>dynamic-graph-python</build_export_depend>
-  <build_export_depend>pinocchio</build_export_depend>
-
-
-  <exec_depend>dynamic-graph-python</exec_depend>
-  <exec_depend>pinocchio</exec_depend>
-  <exec_depend>example-robot-data</exec_depend>
-
-  <test_depend>gtest</test_depend>
+  <depend>dynamic-graph</depend>
+  <depend>pinocchio</depend>
+  <build_depend>doxygen</build_depend>
+  <!-- The following tags are recommended by REP-136 -->
+  <exec_depend condition="$ROS_VERSION == 1">catkin</exec_depend>
+  <exec_depend condition="$ROS_VERSION == 2">ament_cmake</exec_depend>
 
   <doc_depend>doxygen</doc_depend>
   <doc_depend>dynamic_graph</doc_depend>
-
-
+  
+  <buildtool_depend>cmake</buildtool_depend> 
+  
   <export>
+    <build_type>cmake</build_type>
   </export>
 </package>