From faf078372ada4e835424ee6e563e16b94000b529 Mon Sep 17 00:00:00 2001
From: Francois Keith <keith@lirmm.fr>
Date: Mon, 24 Feb 2014 23:04:43 +0100
Subject: [PATCH] Update CMakeLists.txt and package.xml
Some of the library were not generated in the lib folder,
so linking with the dynamic_graph crashed.
Update the dependencies in packages: the dependency in jrl-dyn-urdf
does not concern the ros package version anymore.
---
CMakeLists.txt | 6 ++++--
manifest.xml | 3 ---
package.xml | 12 +++---------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7347125..3f0ebbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,8 @@ install(TARGETS ros_bridge DESTINATION lib)
# 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)
+set_target_properties(ros_bridge PROPERTIES BUILD_WITH_INSTALL_RPATH True
+ LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
macro(compile_plugin NAME)
message(lib path ${LIBRARY_OUTPUT_PATH})
@@ -128,7 +129,8 @@ rospack_use_dependency(ros_interpreter dynamic_graph_bridge_msgs)
add_dependencies(ros_interpreter ros_bridge)
target_link_libraries(ros_interpreter ros_bridge)
-set_target_properties(ros_interpreter PROPERTIES BUILD_WITH_INSTALL_RPATH True)
+set_target_properties(ros_interpreter PROPERTIES BUILD_WITH_INSTALL_RPATH True
+ LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
message(cmakeinstalllibdir ${CMAKE_INSTALL_LIBDIR} )
install(TARGETS ros_interpreter DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/manifest.xml b/manifest.xml
index cbf9c56..14c5c87 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -35,8 +35,5 @@
<depend package="tf"/>
<depend package="realtime_tools"/>
-
- <depend package="jrl_dynamics_urdf"/>
-
<depend package="dynamic_graph_bridge_msgs"/>
</package>
diff --git a/package.xml b/package.xml
index 71f2338..6174c77 100644
--- a/package.xml
+++ b/package.xml
@@ -3,14 +3,14 @@
<version>2.0.0</version>
<description>
- URDF parser for jrl-dynamics
+ ROS bindings for dynamic graph.
</description>
<maintainer email="hpp@laas.fr">hpp@laas.fr</maintainer>
<author email="hpp@laas.fr">hpp@laas.fr</author>
<license>LGPL</license>
- <url>http://ros.org/wiki/jrl_dynamics_urdf</url>
+ <url>http://ros.org/wiki/dynamic_graph_bridge</url>
<export>
<cpp
@@ -29,8 +29,7 @@
<build_depend>sensor_msgs</build_depend>
<build_depend>tf</build_depend>
<build_depend>realtime_tools</build_depend>
- <build_depend>jrl_dynamics_urdf</build_depend>
-<build_depend>message_generation</build_depend>
+ <build_depend>message_generation</build_depend>
<run_depend>std_msgs</run_depend>
@@ -40,10 +39,5 @@
<run_depend>sensor_msgs</run_depend>
<run_depend>tf</run_depend>
<run_depend>realtime_tools</run_depend>
- <run_depend>jrl_dynamics_urdf</run_depend>
<run_depend>message_runtime</run_depend>
-
-
-
-
</package>
--
GitLab