Merge branch 'master' of https://github.com/stack-of-tasks/dynamic_graph_bridge

CMakeLists.txt

@@ -87,6 +87,9 @@ pkg_config_use_dependency(ros_bridge bullet)
 pkg_config_use_dependency(ros_bridge dynamic_graph_bridge_msgs)
 install(TARGETS ros_bridge DESTINATION lib)
 
+# Add ros_bridge in the dynamic-graph-bridge pkg-config file.
+
+
 # Make sure rpath are preserved during the install as ROS dependencies
 # are not installed.
 set_target_properties(ros_bridge PROPERTIES BUILD_WITH_INSTALL_RPATH True
@@ -169,7 +172,9 @@ add_subdirectory(src)
 # Deal with the ROS part.
 add_service_files( FILES RunPythonFile.srv )
 generate_messages( DEPENDENCIES std_msgs )
-catkin_package(CATKIN_DEPENDS message_runtime )
+catkin_package(CATKIN_DEPENDS message_runtime LIBRARIES ros_bridge ros_interpreter)
+# Add libraries in pc file generated by cmake submodule
+PKG_CONFIG_APPEND_LIBS(ros_bridge ros_interpreter)
 
 #install ros executables
 install(PROGRAMS

package.xml

@@ -13,10 +13,6 @@
   <url>http://ros.org/wiki/dynamic_graph_bridge</url>
 
   <export>
-    <cpp
-       cflags="-I${prefix}/include"
-       lflags="-L${prefix}/lib -lros_bridge -lros_interpreter -Wl,-rpath,${prefix}/lib"
-       />
     <rosdoc config="rosdoc.yaml" />
   </export>