Skip to content
Snippets Groups Projects
Commit faf07837 authored by Francois Keith's avatar Francois Keith
Browse files

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.
parent 028bd256
No related branches found
No related tags found
No related merge requests found
...@@ -78,7 +78,8 @@ install(TARGETS ros_bridge DESTINATION lib) ...@@ -78,7 +78,8 @@ install(TARGETS ros_bridge DESTINATION lib)
# Make sure rpath are preserved during the install as ROS dependencies # Make sure rpath are preserved during the install as ROS dependencies
# are not installed. # 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) macro(compile_plugin NAME)
message(lib path ${LIBRARY_OUTPUT_PATH}) message(lib path ${LIBRARY_OUTPUT_PATH})
...@@ -128,7 +129,8 @@ rospack_use_dependency(ros_interpreter dynamic_graph_bridge_msgs) ...@@ -128,7 +129,8 @@ rospack_use_dependency(ros_interpreter dynamic_graph_bridge_msgs)
add_dependencies(ros_interpreter ros_bridge) add_dependencies(ros_interpreter ros_bridge)
target_link_libraries(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} ) message(cmakeinstalllibdir ${CMAKE_INSTALL_LIBDIR} )
install(TARGETS ros_interpreter DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS ros_interpreter DESTINATION ${CMAKE_INSTALL_LIBDIR})
......
...@@ -35,8 +35,5 @@ ...@@ -35,8 +35,5 @@
<depend package="tf"/> <depend package="tf"/>
<depend package="realtime_tools"/> <depend package="realtime_tools"/>
<depend package="jrl_dynamics_urdf"/>
<depend package="dynamic_graph_bridge_msgs"/> <depend package="dynamic_graph_bridge_msgs"/>
</package> </package>
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<version>2.0.0</version> <version>2.0.0</version>
<description> <description>
URDF parser for jrl-dynamics ROS bindings for dynamic graph.
</description> </description>
<maintainer email="hpp@laas.fr">hpp@laas.fr</maintainer> <maintainer email="hpp@laas.fr">hpp@laas.fr</maintainer>
<author email="hpp@laas.fr">hpp@laas.fr</author> <author email="hpp@laas.fr">hpp@laas.fr</author>
<license>LGPL</license> <license>LGPL</license>
<url>http://ros.org/wiki/jrl_dynamics_urdf</url> <url>http://ros.org/wiki/dynamic_graph_bridge</url>
<export> <export>
<cpp <cpp
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
<build_depend>sensor_msgs</build_depend> <build_depend>sensor_msgs</build_depend>
<build_depend>tf</build_depend> <build_depend>tf</build_depend>
<build_depend>realtime_tools</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> <run_depend>std_msgs</run_depend>
...@@ -40,10 +39,5 @@ ...@@ -40,10 +39,5 @@
<run_depend>sensor_msgs</run_depend> <run_depend>sensor_msgs</run_depend>
<run_depend>tf</run_depend> <run_depend>tf</run_depend>
<run_depend>realtime_tools</run_depend> <run_depend>realtime_tools</run_depend>
<run_depend>jrl_dynamics_urdf</run_depend>
<run_depend>message_runtime</run_depend> <run_depend>message_runtime</run_depend>
</package> </package>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment