Merge pull request #793 from garaemon/use-collada-urdf-jsk-patch

[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 · e805357 · e805357
2 parents 262a9e0 + 65a183c
commit e805357
Showing 1 changed file with 7 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,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)