Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hrpsys_ros_bridge] Use collada_urdf_jsk_patch in order to convert dae into urdf which can be used in gazebo #793

Merged
merged 1 commit into from
Aug 20, 2015
Merged

[hrpsys_ros_bridge] Use collada_urdf_jsk_patch in order to convert dae into urdf which can be used in gazebo #793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions hrpsys_ros_bridge/cmake/compile_robot_model.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down