From 8f15e3544229274f3d3190f1b6419a83b99fe0f8 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Thu, 26 Dec 2024 03:58:31 +0000 Subject: [PATCH] [collada_urdf_jsk_patch] [ros-o] add CATKIN_IGNORE only when ROS-O, use STREQUAL to compare ROS_DISTRO in cmake --- jsk_ros_patch/collada_urdf_jsk_patch/CATKIN_IGNORE | 0 jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt | 11 +++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) delete mode 100644 jsk_ros_patch/collada_urdf_jsk_patch/CATKIN_IGNORE diff --git a/jsk_ros_patch/collada_urdf_jsk_patch/CATKIN_IGNORE b/jsk_ros_patch/collada_urdf_jsk_patch/CATKIN_IGNORE deleted file mode 100644 index e69de29bb..000000000 diff --git a/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt b/jsk_ros_patch/collada_urdf_jsk_patch/CMakeLists.txt index 322560351..65643bfb6 100644 --- 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 #catkin_lint: ignore_once missing_file + 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)