From 797c7300c1b88142bfb077811604374c99198410 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 17 Jun 2021 13:51:56 -0700 Subject: [PATCH 1/4] Ignore unported packages --- fetch_calibration/COLCON_IGNORE | 0 fetch_depth_layer/COLCON_IGNORE | 0 fetch_description/COLCON_IGNORE | 0 fetch_ikfast_plugin/COLCON_IGNORE | 0 fetch_maps/COLCON_IGNORE | 0 fetch_moveit_config/COLCON_IGNORE | 0 fetch_navigation/COLCON_IGNORE | 0 fetch_ros/COLCON_IGNORE | 0 fetch_teleop/COLCON_IGNORE | 0 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 fetch_calibration/COLCON_IGNORE create mode 100644 fetch_depth_layer/COLCON_IGNORE create mode 100644 fetch_description/COLCON_IGNORE create mode 100644 fetch_ikfast_plugin/COLCON_IGNORE create mode 100644 fetch_maps/COLCON_IGNORE create mode 100644 fetch_moveit_config/COLCON_IGNORE create mode 100644 fetch_navigation/COLCON_IGNORE create mode 100644 fetch_ros/COLCON_IGNORE create mode 100644 fetch_teleop/COLCON_IGNORE diff --git a/fetch_calibration/COLCON_IGNORE b/fetch_calibration/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/fetch_depth_layer/COLCON_IGNORE b/fetch_depth_layer/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/fetch_description/COLCON_IGNORE b/fetch_description/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/fetch_ikfast_plugin/COLCON_IGNORE b/fetch_ikfast_plugin/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/fetch_maps/COLCON_IGNORE b/fetch_maps/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/fetch_moveit_config/COLCON_IGNORE b/fetch_moveit_config/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/fetch_navigation/COLCON_IGNORE b/fetch_navigation/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/fetch_ros/COLCON_IGNORE b/fetch_ros/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b diff --git a/fetch_teleop/COLCON_IGNORE b/fetch_teleop/COLCON_IGNORE new file mode 100644 index 00000000..e69de29b From 98c317fb9938f24a2436b974e2ffe89b0d1526fa Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 17 Jun 2021 15:17:38 -0700 Subject: [PATCH 2/4] Update package manifest --- fetch_description/package.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fetch_description/package.xml b/fetch_description/package.xml index fae619ec..833b14e0 100644 --- a/fetch_description/package.xml +++ b/fetch_description/package.xml @@ -1,5 +1,5 @@ - - + + fetch_description 0.8.3 @@ -21,7 +21,12 @@ https://github.com/fetchrobotics/fetch_ros/issues https://github.com/fetchrobotics/fetch_ros - catkin + ament_cmake + urdf xacro + + + ament_cmake + From f4a6995ddd7ae7affade6b33d87ecc5c6445b49d Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 17 Jun 2021 15:18:03 -0700 Subject: [PATCH 3/4] Update package cmake --- fetch_description/CMakeLists.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fetch_description/CMakeLists.txt b/fetch_description/CMakeLists.txt index d8513811..e1ffa0bb 100644 --- a/fetch_description/CMakeLists.txt +++ b/fetch_description/CMakeLists.txt @@ -1,13 +1,11 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(fetch_description) -find_package(catkin) -catkin_package() +find_package(ament_cmake REQUIRED) -install(DIRECTORY meshes - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +install( + DIRECTORY meshes robots + DESTINATION share/${PROJECT_NAME} ) -install(DIRECTORY robots - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -) +ament_package() From 7a8b60b7157070d19ba1a0f9a645b255d3cc720b Mon Sep 17 00:00:00 2001 From: ruffsl Date: Thu, 17 Jun 2021 15:18:18 -0700 Subject: [PATCH 4/4] Remove ignore file --- fetch_description/COLCON_IGNORE | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fetch_description/COLCON_IGNORE diff --git a/fetch_description/COLCON_IGNORE b/fetch_description/COLCON_IGNORE deleted file mode 100644 index e69de29b..00000000