Merge branch 'master' of github.com:introlab/rtabmap into noetic-devel

.github/workflows/cmake-ros.yml

@@ -3,7 +3,7 @@ name: CMake-ROS
 on:
   push:
     branches: 
-      - jazzy-devel
+      - noetic-devel
   pull_request:
     branches: 
       - '**'
@@ -23,10 +23,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ros_distribution: [jazzy]
+        ros_distribution: [ noetic ]
         include:
-        - ros_distribution: 'jazzy'
-          os: ubuntu-24.04
+        - ros_distribution: 'noetic'
+          os: ubuntu-20.04
 
     steps:   
     - uses: ros-tooling/setup-ros@v0.7

package.xml

@@ -16,14 +16,13 @@
   <depend>cv_bridge</depend>
   <depend>libg2o</depend>
   <depend>gtsam</depend>
-  <depend>tbb</depend> <!-- till tbb is added to gtsam dependencies https://github.com/borglab/gtsam/issues/1759 -->
   <!-- <depend>libopenni2-dev</depend> --> <!-- not available on Jessie -->
   <depend>libpcl-all-dev</depend> <!--  include libvtk-qt -->
   <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>
-  <!-- <depend>grid_map_core</depend> --> <!-- till this PR is released https://github.com/ANYbotics/grid_map/pull/499 -->
+  <depend>grid_map_core</depend>
   <depend>qt_gui_cpp</depend> <!-- libqt4-dev or libqt5-dev -->
   <depend>zlib</depend>