Merge pull request #68 in SWDEV/franka_ros from example-controllers-catkin to develop

* commit '9c54abc7':
  Add dependency on hardware_interface
  Bump version
  Add missing build_export_depends, don't install example controller includes
  Catkin-related fixes for franka_example_controllers

CHANGELOG.md

 # CHANGELOG
 
+## 0.2.2 - UNRELEASED
+
+Requires `libfranka` >= 0.2.0
+
+  * Catkin-related fixes for `franka_example_controllers`
+  * Added missing `<build_export_depend>` for `message_runtime`
+
 ## 0.2.1 - 2018-01-30
 
 Requires `libfranka` >= 0.2.0

franka_control/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_control</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description>franka_control provides a hardware node to control a Franka Emika research robot</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>
@@ -35,6 +35,8 @@
   <exec_depend>message_runtime</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>
 
+  <build_export_depend>message_runtime</build_export_depend>
+
   <export>
     <controller_interface plugin="${prefix}/franka_controller_plugins.xml"/>
   </export>

franka_description/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_description</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description>franka_description contains URDF files and meshes of Franka Emika robots</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_example_controllers/CMakeLists.txt

@@ -8,12 +8,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(catkin REQUIRED COMPONENTS
   controller_interface
+  dynamic_reconfigure
   franka_hw
+  geometry_msgs
+  hardware_interface
+  message_generation
   pluginlib
   realtime_tools
   roscpp
-  message_generation
-  dynamic_reconfigure
+  rospy
 )
 
 find_package(Eigen3 REQUIRED)
@@ -31,9 +34,17 @@ generate_dynamic_reconfigure_options(
 )
 
 catkin_package(
-  INCLUDE_DIRS include
   LIBRARIES franka_example_controllers
-  CATKIN_DEPENDS controller_interface franka_hw pluginlib
+  CATKIN_DEPENDS
+    controller_interface
+    dynamic_reconfigure
+    franka_hw
+    geometry_msgs
+    hardware_interface
+    message_runtime
+    pluginlib
+    realtime_tools
+    roscpp
   DEPENDS Franka
 )
 
@@ -69,9 +80,6 @@ install(TARGETS franka_example_controllers
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
-install(DIRECTORY include/${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-)
 install(DIRECTORY launch
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
@@ -81,6 +89,10 @@ install(DIRECTORY config
 install(FILES franka_example_controllers_plugin.xml
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
+catkin_install_python(
+  PROGRAMS scripts/interactive_marker.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
 
 ## Tools
 include(${CMAKE_CURRENT_LIST_DIR}/../cmake/ClangTools.cmake OPTIONAL

franka_example_controllers/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_example_controllers</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description>franka_example_controllers provides example code for controlling Franka Emika research robots with ros_control</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>
@@ -13,18 +13,24 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>roscpp</build_depend>
   <build_depend>message_generation</build_depend>
-  <build_depend>dynamic_reconfigure</build_depend>
   <build_depend>eigen</build_depend>
 
+  <build_export_depend>message_runtime</build_export_depend>
+
   <depend>controller_interface</depend>
+  <depend>dynamic_reconfigure</depend>
   <depend>franka_hw</depend>
+  <depend>geometry_msgs</depend>
+  <depend>hardware_interface</depend>
   <depend>libfranka</depend>
   <depend>pluginlib</depend>
   <depend>realtime_tools</depend>
+  <depend>roscpp</depend>
 
   <exec_depend>franka_description</exec_depend>
+  <exec_depend>message_runtime</exec_depend>
+  <exec_depend>rospy</exec_depend>
 
   <export>
     <controller_interface plugin="${prefix}/franka_example_controllers_plugin.xml"/>

franka_gripper/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_gripper</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description>This package implements the franka gripper of type Franka Hand for the use in ros</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>
@@ -23,4 +23,6 @@
   <depend>actionlib_msgs</depend>
 
   <exec_depend>message_runtime</exec_depend>
+
+  <build_export_depend>message_runtime</build_export_depend>
 </package>

franka_hw/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_hw</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description>franka_hw provides hardware interfaces for using Franka Emika research robots with ros_control</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_msgs/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_msgs</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description>franka_msgs provides messages specific to Franka Emika research robots</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>
@@ -16,6 +16,7 @@
   <depend>std_msgs</depend>
   <build_depend>message_generation</build_depend>
   <exec_depend>message_runtime</exec_depend>
+  <build_export_depend>message_runtime</build_export_depend>
 
   <export>
     <architecture_independent/>

franka_ros/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_ros</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description>franka_ros is a metapackage for all Franka Emika ROS packages</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

franka_visualization/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_visualization</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description>This package contains visualization tools for Franka Emika.</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>

panda_moveit_config/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>panda_moveit_config</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <description> A partly automatically generated package with all the configuration and launch files for using Panda research with MoveIt!</description>
   <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>