[collada_urdf_jsk_patch] [ros-o] add CATKIN_IGNORE only when ROS-O, u…

…se STREQUAL to compare ROS_DISTRO in cmake
jsk-ros-pkg · Dec 26, 2024 · c7154c8 · c7154c8
1 parent 3f42be3
commit c7154c8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/jsk_ros_patch/collada_urdf_jsk_patch/CATKIN_IGNORE b/jsk_ros_patch/collada_urdf_jsk_patch/CATKIN_IGNORE
diff --git a/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt b/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt
@@ -5,12 +5,19 @@ project(collada_urdf_jsk_patch)
 if(("$ENV{ROS_DISTRO}" STREQUAL "groovy") OR ("$ENV{ROS_DISTRO}" STREQUAL "hydro"))
   set(SOURCE_DISTRO hydro-devel)
   set(GIT_REPO robot_model)
-elseif ("$ENV{ROS_DISTRO}" STRLESS "melodic")
+elseif (("$ENV{ROS_DISTRO}" STREQUAL "indigo") OR ("$ENV{ROS_DISTRO}" STREQUAL "jade") OR ("$ENV{ROS_DISTRO}" STREQUAL "kinetic"))
   set(SOURCE_DISTRO bd4fc369d56eaa0c31d8cb17677e00b9d9685de6) # 1.11.13, before strip indigo
   set(GIT_REPO robot_model)
-elseif ("$ENV{ROS_DISTRO}" STREQUAL "melodic" OR "$ENV{ROS_DISTRO}" STRGREATER "melodic")
+elseif (("$ENV{ROS_DISTRO}" STREQUAL "melodic") OR ("$ENV{ROS_DISTRO}" STREQUAL "noetic"))
   set(SOURCE_DISTRO 923c5d33bd245e82134e8ae02e4c9d379e80eb27) # 1.12.12
   set(GIT_REPO collada_urdf)
+else()
+  find_package(catkin REQUIRED)
+  catkin_package(CATKIN_DEPENDS)
+  file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/CATKIN_IGNORE)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CATKIN_IGNORE
+    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+  return()
 endif()
 if ("$ENV{ROS_DISTRO}" STREQUAL "kinetic" OR "$ENV{ROS_DISTRO}" STRGREATER "kinetic")
     set(CXXFLAGS CXXFLAGS=-std=gnu++11)