Revert "Fix ros/collada_urdf#43"

This reverts commit 835a711.
start-jsk · Aug 11, 2022 · 29681bf · 29681bf
1 parent 835a711
commit 29681bf
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/hrpsys_ros_bridge/cmake/compile_robot_model.cmake b/hrpsys_ros_bridge/cmake/compile_robot_model.cmake
@@ -318,15 +318,7 @@ endmacro()
 # get path to collada_to_urdf
 macro(get_collada_to_urdf _collada_to_urdf_exe)
   find_package(collada_urdf_jsk_patch QUIET)
-
-  # noetic collada_urdf could not find_packag-ed due to https://github.com/ros/collada_urdf/issues/43
-  if("$ENV{ROS_DISTRO}" STREQUAL "noetic")
-    set(collada_urdf_PREFIX "/opt/ros/noetic")
-    set(collada_urdf_FOUND TRUE)
-  else()
-    find_package(collada_urdf REQUIRED)
-  endif("$ENV{ROS_DISTRO}" STREQUAL "noetic")
-
+  find_package(collada_urdf REQUIRED)
   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)