From 65a183c36d3ad8f42dfbeb9d61a66a7a96c0e42f Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Fri, 21 Aug 2015 00:12:11 +0900 Subject: [PATCH] [hrpsys_ros_bridge] Use collada_urdf_jsk_patch in order to convert dae into urdf which can be used in gazebo --- hrpsys_ros_bridge/cmake/compile_robot_model.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hrpsys_ros_bridge/cmake/compile_robot_model.cmake b/hrpsys_ros_bridge/cmake/compile_robot_model.cmake index 07a92a57e..51c97c19a 100644 --- a/hrpsys_ros_bridge/cmake/compile_robot_model.cmake +++ b/hrpsys_ros_bridge/cmake/compile_robot_model.cmake @@ -316,9 +316,14 @@ endmacro() # get path to collada_to_urdf macro(get_collada_to_urdf _collada_to_urdf_exe) + find_package(collada_urdf_jsk_patch QUIET) find_package(collada_urdf REQUIRED) - set(${_collada_to_urdf_exe} ${collada_urdf_PREFIX}/lib/collada_urdf/collada_to_urdf) - if(NOT EXISTS ${${_collada_to_urdf_exe}}) + if (collada_urdf_jsk_patch_FOUND) + set(${_collada_to_urdf_exe} ${collada_urdf_jsk_patch_PREFIX}/lib/collada_urdf_jsk_patch/collada_to_urdf) + elseif (collada_urdf_FOUND) + set(${_collada_to_urdf_exe} ${collada_urdf_PREFIX}/lib/collada_urdf/collada_to_urdf) + endif (collada_urdf_jsk_patch_FOUND) + if(NOT EXISTS "${${_collada_to_urdf_exe}}") message(FATAL_ERROR "could not find ${${_collada_to_urdf_exe}}") endif() endmacro(get_collada_to_urdf _collada_to_urdf_exe)