Merge pull request #5 from Rascof/devel

Update dynamic-graph-tutorial and fix warnings with sphinx

Author: nim65s

CMakeLists.txt

@@ -26,7 +26,6 @@ SET(CUSTOM_HEADER_DIR "dynamic-graph/tutorial")
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/python.cmake)
-INCLUDE(cmake/sphinx.cmake)
 
 # Project definition
 COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
@@ -72,7 +71,6 @@ ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tests)
-ADD_SUBDIRECTORY(doc)
 
 IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
   INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME})

doc/CMakeLists.txt

@@ -1,4 +1,5 @@
-<package format="2">
+<?xml version="1.0"?>
+<package format="3">
   <name>dynamic-graph-tutorial</name>
   <version>1.2.1</version>
   <description>
@@ -13,9 +14,19 @@
 
   <build_depend>dynamic-graph</build_depend>
   <build_depend>dynamic-graph-python</build_depend>
-
-  <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>git</build_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>
+  <depend>boost</depend>
 
   <doc_depend>doxygen</doc_depend>
+  
+  <buildtool_depend>cmake</buildtool_depend>
 
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+  
 </package>