Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions distros/humble/patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ rtabmap:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "ceres-solver", "${{ 'libdc1394' if not win }}", "libusb", "vtk"]
remove_host: ["ros2-qt-gui-cpp"]
remove_run: ["ros2-qt-gui-cpp"]
rtabmap_viz: # find_package(RTABMap COMPONENTS gui): needs rtabmap built with Qt, built before it in parallel CI builds
add_host: ["ros2-rtabmap"]
add_run: ["ros2-rtabmap"]
rviz_ogre_vendor:
add_host: ["zlib", "freeimage", "freetype", "assimp", "zziplib", "pugixml", "${{ 'libglu' if linux }}"]
add_build: ["vcstool"]
Expand Down
11 changes: 6 additions & 5 deletions distros/humble/pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@ py_trees:
dep_name: py-trees
max_pin: 'x.x.x'
override_version: 2.6.0
rtabmap:
additional_cmake_args:
if: win
then: "-DWITH_QT=OFF -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DWITH_GTSAM=OFF"
else: "-DWITH_QT=OFF -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF"
turtlebot3_node: # odometry.cpp uses M_PI
additional_cmake_args:
if: win
Expand All @@ -129,3 +124,9 @@ urdfdom_headers:
# Remove build_number fields below on new full rebuild
zenoh_cpp_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
rtabmap:
additional_cmake_args:
if: win
then: "-DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DWITH_GTSAM=OFF"
else: "-DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF"
build_number: 26 # built with Qt (its GUI library, for rtabmap_viz)
2 changes: 0 additions & 2 deletions distros/humble/vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ mutex_package:
version: "0.12.0"

packages_exclude:
- rtabmap_rviz_plugins # links PCL, whose VTK is Qt 6 on conda-forge, into a Qt 5 RViz plugin (humble's RViz is Qt 5)
- rtabmap_viz # needs rtabmap's GUI, which follows VTK's Qt 6, while humble's RViz is Qt 5 (rtabmap is built without Qt here)

- if: not linux
then:
Expand Down
4 changes: 0 additions & 4 deletions distros/jazzy/vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ build_number: 31

mutex_package:
version: "0.21.0"

packages_exclude:
- rtabmap_rviz_plugins # links PCL, whose VTK is Qt 6 on conda-forge, into a Qt 5 RViz plugin (jazzy's RViz is Qt 5); rtabmap_viz is fine, it uses only rtabmap's Qt 6

32 changes: 29 additions & 3 deletions shared/patch/ros2-rtabmap-rviz-plugins.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e47a68..4658ddb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,7 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
@@ -9,8 +9,7 @@
# issues #1285 #1288
find_library(
message_filters_LIB NAMES message_filters
Expand All @@ -12,7 +11,34 @@ index 4e47a68..4658ddb 100644
)
endif()

@@ -96,7 +95,7 @@ ENDIF()
@@ -61,6 +60,26 @@
rtabmap_msgs
)

+# RoboStack: with a Qt 5 RViz, keep Qt 6 out of this plugin. conda-forge's VTK links Qt 6
+# (VTK::GUISupportQt/RenderingQt, reached through PCL and rtabmap::core) and so does rtabmap's
+# GUI (rtabmap::gui, exported by rtabmap_conversions). The plugin uses none of them.
+if(Qt5_FOUND)
+ set(_rs_qt6_regex "Qt6::|VTK::GUISupportQt|VTK::RenderingQt|rtabmap::gui|pcl_visualization")
+ get_property(_rs_imported_targets DIRECTORY PROPERTY IMPORTED_TARGETS)
+ foreach(_rs_target ${_rs_imported_targets})
+ get_target_property(_rs_libs ${_rs_target} INTERFACE_LINK_LIBRARIES)
+ if(_rs_libs)
+ list(FILTER _rs_libs EXCLUDE REGEX "${_rs_qt6_regex}")
+ set_property(TARGET ${_rs_target} PROPERTY INTERFACE_LINK_LIBRARIES "${_rs_libs}")
+ endif()
+ endforeach()
+ foreach(_rs_pkg ${AmentLibraries})
+ if(${_rs_pkg}_LIBRARIES)
+ list(FILTER ${_rs_pkg}_LIBRARIES EXCLUDE REGEX "${_rs_qt6_regex}")
+ endif()
+ endforeach()
+endif()
+
###########
## Build ##
###########
@@ -96,7 +115,7 @@

# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
Expand Down
1 change: 1 addition & 0 deletions shared/vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ packages_select_by_deps:
- rqt_runtime_monitor
- rtabmap
- rtabmap_ros # requested in https://github.com/RoboStack/ros-lyrical/pull/83
- rtabmap_rviz_plugins
- rtcm_msgs
- rtest
- rviz2
Expand Down