diff --git a/distros/humble/patch/dependencies.yaml b/distros/humble/patch/dependencies.yaml index 0a5553164..f621fcf2b 100644 --- a/distros/humble/patch/dependencies.yaml +++ b/distros/humble/patch/dependencies.yaml @@ -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"] diff --git a/distros/humble/pkg_additional_info.yaml b/distros/humble/pkg_additional_info.yaml index 771647d4c..816e687b2 100644 --- a/distros/humble/pkg_additional_info.yaml +++ b/distros/humble/pkg_additional_info.yaml @@ -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 @@ -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) diff --git a/distros/humble/vinca.yaml b/distros/humble/vinca.yaml index f5ca5142a..239dd4261 100644 --- a/distros/humble/vinca.yaml +++ b/distros/humble/vinca.yaml @@ -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: diff --git a/distros/jazzy/vinca.yaml b/distros/jazzy/vinca.yaml index d9f7d6a3b..ecf62c64b 100644 --- a/distros/jazzy/vinca.yaml +++ b/distros/jazzy/vinca.yaml @@ -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 - diff --git a/shared/patch/ros2-rtabmap-rviz-plugins.patch b/shared/patch/ros2-rtabmap-rviz-plugins.patch index a0810fc04..5a710f94d 100644 --- a/shared/patch/ros2-rtabmap-rviz-plugins.patch +++ b/shared/patch/ros2-rtabmap-rviz-plugins.patch @@ -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 @@ -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. diff --git a/shared/vinca.yaml b/shared/vinca.yaml index 2587f04db..708e5e2c6 100644 --- a/shared/vinca.yaml +++ b/shared/vinca.yaml @@ -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