merged master->kilted

.github/workflows/cmake-ros.yml

@@ -3,7 +3,7 @@ name: CMake-ROS
 on:
   push:
     branches: 
-      - lyrical-devel
+      - kilted-devel
   pull_request:
     branches: 
       - '**'
@@ -27,10 +27,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ros_distribution: [ lyrical ]
+        ros_distribution: [ kilted ]
         include:
-        - ros_distribution: 'lyrical'
+        - ros_distribution: 'kilted'
-          skip_keys: "" # When releasing to ROS2, the skip_keys shoudl be empty, patch these deps in package.xml instead.
+          skip_keys: ""
     container:
       image: osrf/ros:${{ matrix.ros_distribution }}-desktop-full
     steps:   

package.xml

@@ -18,7 +18,7 @@
   <depend>gtsam</depend>
   <!-- <depend>libopenni2-dev</depend> --> <!-- not available on Jessie -->
   <depend>libpcl-all-dev</depend> <!--  include libvtk-qt -->
-  <!-- <depend>libpointmatcher</depend> Not available on lyrical--> <!-- optional but recommended if lidar is used, also not available on 32 bits system, but rtabmap can be built without it -->
+  <depend>libpointmatcher</depend> <!-- optional but recommended if lidar is used, also not available on 32 bits system, but rtabmap can be built without it -->
   <!-- <depend>libproj-dev</depend> needed due to error in vtk6 (kinetic)-->
   <depend>libsqlite3-dev</depend>
   <depend>liboctomap-dev</depend>