Compare commits

..
Author SHA1 Message Date
matlabbe d10f2d9738 adding ci to rolling-devel branch 2025-07-12 10:34:34 -07:00
matlabbe 33c433baba merged master -> rolling-devel 2025-07-12 10:32:24 -07:00
matlabbe a58024e0c5 Added gtsam/tbb depend 2024-07-22 20:55:51 -07:00
matlabbe bdb3e3fab8 patch rolling 2024-07-22 20:53:12 -07:00
4 changed files with 7 additions and 23 deletions
+2 -8
View File
@@ -3,7 +3,7 @@ name: CMake-ROS
on:
push:
branches:
- master
- rolling-devel
pull_request:
branches:
- '**'
@@ -23,14 +23,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ros_distribution: [ humble, jazzy, kilted, rolling ]
ros_distribution: [ rolling ]
include:
- ros_distribution: 'humble'
os: ubuntu-22.04
- ros_distribution: 'jazzy'
os: ubuntu-24.04
- ros_distribution: 'kilted'
os: ubuntu-24.04
- ros_distribution: 'rolling'
os: ubuntu-24.04
-10
View File
@@ -110,16 +110,6 @@ IF(BUILD_AS_BUNDLE AND (APPLE OR WIN32))
ENDIF(WIN32)
ENDIF(k4a_FOUND)
IF(ZED_FOUND)
# Install needed zlibwapi.dll
IF(WIN32)
file(TO_CMAKE_PATH "$ENV{ZED_SDK_ROOT_DIR}" ENV_ZED_SDK_ROOT_DIR)
INSTALL(FILES "${ENV_ZED_SDK_ROOT_DIR}/bin/zlibwapi.dll"
DESTINATION ${thirdparty_dest_dir}
COMPONENT runtime)
ENDIF(WIN32)
ENDIF(ZED_FOUND)
IF(Torch_FOUND)
# Install needed cudnn_ops_infer64_8.dll and cudnn_cnn_infer64_8.dll
# TODO: should be a more general way to include them if version is different
@@ -8,7 +8,6 @@
#ifndef CORELIB_SRC_PYTHON_PYTHONINTERFACE_H_
#define CORELIB_SRC_PYTHON_PYTHONINTERFACE_H_
#include "rtabmap/core/rtabmap_core_export.h" // DLL export/import defines
#include <string>
#include <rtabmap/utilite/UMutex.h>
@@ -24,7 +23,7 @@ namespace rtabmap {
* Create a single PythonInterface on main thread at
* global scope before any Python classes.
*/
class RTABMAP_CORE_EXPORT PythonInterface
class PythonInterface
{
public:
PythonInterface();
@@ -35,7 +34,7 @@ private:
pybind11::gil_scoped_release* release_;
};
std::string RTABMAP_CORE_EXPORT getPythonTraceback();
std::string getPythonTraceback();
}
+3 -2
View File
@@ -16,14 +16,15 @@
<depend>cv_bridge</depend>
<depend>libg2o</depend>
<depend>gtsam</depend>
<depend>tbb</depend> <!-- till gtsam version is updated with tbb depend -->
<!-- <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>qt_gui_cpp</depend> <!-- libqt4-dev or libqt5-dev -->
<!-- <depend>grid_map_core</depend> # not available on Rolling -->
<depend>qtbase5-dev</depend>
<depend>zlib</depend>
<export>