[hrpsys_ros_bridge] Use collada_urdf_jsk_patch in order to convert dae

into urdf which can be used in gazebo
start-jsk · Aug 20, 2015 · 8121f5a · 8121f5a
1 parent 19f388b
commit 8121f5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/hrpsys_ros_bridge/cmake/compile_robot_model.cmake b/hrpsys_ros_bridge/cmake/compile_robot_model.cmake
@@ -316,8 +316,8 @@ endmacro()
 
 # get path to collada_to_urdf
 macro(get_collada_to_urdf _collada_to_urdf_exe)
-  find_package(collada_urdf REQUIRED)
-  set(${_collada_to_urdf_exe} ${collada_urdf_PREFIX}/lib/collada_urdf/collada_to_urdf)
+  find_package(collada_urdf_jsk_patch REQUIRED)
+  set(${_collada_to_urdf_exe} ${collada_urdf_jsk_patch_PREFIX}/lib/collada_urdf_jsk_patch/collada_to_urdf)
   if(NOT EXISTS ${${_collada_to_urdf_exe}})
     message(FATAL_ERROR "could not find ${${_collada_to_urdf_exe}}")
   endif()

diff --git a/hrpsys_ros_bridge/package.xml b/hrpsys_ros_bridge/package.xml
@@ -28,6 +28,7 @@
   <build_depend>angles</build_depend>
   <build_depend>camera_info_manager</build_depend>
   <build_depend>collada_urdf</build_depend>
+  <build_depend>collada_urdf_jsk_patch</build_depend>
   <build_depend>control_msgs</build_depend>
   <build_depend>diagnostic_aggregator</build_depend>
   <build_depend>diagnostic_msgs</build_depend>
@@ -92,6 +93,7 @@
   <run_depend>tf</run_depend>
   <run_depend>visualization_msgs</run_depend>
   <run_depend>geometry_msgs</run_depend>
+  <run_depend>collada_urdf_jsk_patch</run_depend>
   <!-- <test_depend>hrpsys</test_depend> -->
   <!-- <test_depend>hrpsys_tools</test_depend> -->
   <!-- <test_depend>openrtm_tools</test_depend> -->