diff --git a/distros/humble/patch/ros2-cartographer-ros.patch b/distros/humble/patch/ros2-cartographer-ros.patch index e63aa4fb2..10538df67 100644 --- a/distros/humble/patch/ros2-cartographer-ros.patch +++ b/distros/humble/patch/ros2-cartographer-ros.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7f476296..0725a05d5 100644 +index 213770e..d9392ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,15 @@ find_package(urdf REQUIRED) find_package(urdfdom_headers REQUIRED) find_package(visualization_msgs REQUIRED) - + +# glog is not linked, however we look for it to detect the glog version +# and use a different code path if glog >= 0.7.0 is detected +find_package(glog CONFIG QUIET) @@ -18,6 +18,26 @@ index f7f476296..0725a05d5 100644 include_directories( include ${PCL_INCLUDE_DIRS} +@@ -64,7 +73,6 @@ add_library(${PROJECT_NAME} + src/node_constants.cpp + src/node.cpp + src/node_options.cpp +- src/offline_node.cpp + src/playable_bag.cpp + src/ros_log_sink.cpp + src/ros_map.cpp +@@ -114,7 +122,10 @@ add_executable(cartographer_occupancy_grid_node src/occupancy_grid_node_main.cpp + target_link_libraries(cartographer_occupancy_grid_node ${PROJECT_NAME}) + ament_target_dependencies(cartographer_occupancy_grid_node ${dependencies}) + +-add_executable(cartographer_offline_node src/offline_node_main.cpp) ++# offline_node.cpp defines the same gflags as node_main.cpp and assets_writer_main.cpp; ++# in a shared library every executable would register them twice and abort at startup ++# ("flag 'collect_metrics' was defined more than once") ++add_executable(cartographer_offline_node src/offline_node_main.cpp src/offline_node.cpp) + target_link_libraries(cartographer_offline_node ${PROJECT_NAME}) + ament_target_dependencies(cartographer_offline_node ${dependencies}) + diff --git a/src/ros_log_sink.cpp b/src/ros_log_sink.cpp index 1396381d4..9e189c690 100644 --- a/src/ros_log_sink.cpp diff --git a/distros/humble/pkg_additional_info.yaml b/distros/humble/pkg_additional_info.yaml index 9005c7193..d2127282d 100644 --- a/distros/humble/pkg_additional_info.yaml +++ b/distros/humble/pkg_additional_info.yaml @@ -2,8 +2,6 @@ apriltag: generate_dummy_package_with_run_deps: dep_name: apriltag max_pin: 'x.x.x' -cartographer_ros: - additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON" eigenpy: generate_dummy_package_with_run_deps: dep_name: eigenpy @@ -111,6 +109,9 @@ ament_cmake_gtest: # uses conda-forge's gtest instead of gtest_vendor's sources build_number: 23 aruco_ros: # its recipe test stops the node for sure (package tests hung on macOS) build_number: 23 +cartographer_ros: + additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON" + build_number: 23 # offline_node.cpp out of the shared library (duplicate gflags abort) mrpt_gui: build_number: 24 rtabmap_slam: # its recipe test stops the node for sure (package tests hung on macOS) diff --git a/distros/jazzy/patch/ros2-cartographer-ros.patch b/distros/jazzy/patch/ros2-cartographer-ros.patch index a7bf8cdb3..b9176cdb6 100644 --- a/distros/jazzy/patch/ros2-cartographer-ros.patch +++ b/distros/jazzy/patch/ros2-cartographer-ros.patch @@ -32,6 +32,26 @@ index f7f476296..0725a05d5 100644 include_directories( include ${PCL_INCLUDE_DIRS} +@@ -64,7 +80,6 @@ add_library(${PROJECT_NAME} + src/node_constants.cpp + src/node.cpp + src/node_options.cpp +- src/offline_node.cpp + src/playable_bag.cpp + src/ros_log_sink.cpp + src/ros_map.cpp +@@ -114,7 +129,10 @@ add_executable(cartographer_occupancy_grid_node src/occupancy_grid_node_main.cpp + target_link_libraries(cartographer_occupancy_grid_node ${PROJECT_NAME}) + ament_target_dependencies(cartographer_occupancy_grid_node ${dependencies}) + +-add_executable(cartographer_offline_node src/offline_node_main.cpp) ++# offline_node.cpp defines the same gflags as node_main.cpp and assets_writer_main.cpp; ++# in a shared library every executable would register them twice and abort at startup ++# ("flag 'collect_metrics' was defined more than once") ++add_executable(cartographer_offline_node src/offline_node_main.cpp src/offline_node.cpp) + target_link_libraries(cartographer_offline_node ${PROJECT_NAME}) + ament_target_dependencies(cartographer_offline_node ${dependencies}) + diff --git a/src/ros_log_sink.cpp b/src/ros_log_sink.cpp index 1396381d4..9e189c690 100644 --- a/src/ros_log_sink.cpp diff --git a/distros/jazzy/pkg_additional_info.yaml b/distros/jazzy/pkg_additional_info.yaml index 20b101a58..e699afa27 100644 --- a/distros/jazzy/pkg_additional_info.yaml +++ b/distros/jazzy/pkg_additional_info.yaml @@ -2,8 +2,6 @@ apriltag: generate_dummy_package_with_run_deps: dep_name: apriltag max_pin: 'x.x.x' -cartographer_ros: - additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON" eigenpy: generate_dummy_package_with_run_deps: dep_name: eigenpy @@ -135,6 +133,9 @@ ament_cmake_gtest: # uses conda-forge's gtest instead of gtest_vendor's sources build_number: 28 aruco_ros: # its recipe test stops the node for sure (package tests hung on macOS) build_number: 28 +cartographer_ros: + additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON" + build_number: 28 # offline_node.cpp out of the shared library (duplicate gflags abort) fuse_viz: build_number: 28 grid_map_rviz_plugin: diff --git a/distros/lyrical/patch/ros2-cartographer-ros.patch b/distros/lyrical/patch/ros2-cartographer-ros.patch index 1e21cbb50..fb98d565b 100644 --- a/distros/lyrical/patch/ros2-cartographer-ros.patch +++ b/distros/lyrical/patch/ros2-cartographer-ros.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7f4762..42ec579 100644 +index f7f4762..cd0867b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,16 +28,19 @@ endif() @@ -24,7 +24,7 @@ index f7f4762..42ec579 100644 find_package(rosbag2_cpp REQUIRED) find_package(rosbag2_storage REQUIRED) find_package(sensor_msgs REQUIRED) -@@ -47,17 +50,27 @@ find_package(tf2_eigen REQUIRED) +@@ -47,24 +50,33 @@ find_package(tf2_eigen REQUIRED) find_package(tf2_msgs REQUIRED) find_package(tf2_ros REQUIRED) find_package(urdf REQUIRED) @@ -59,7 +59,14 @@ index f7f4762..42ec579 100644 src/assets_writer.cpp src/map_builder_bridge.cpp src/msg_conversion.cpp -@@ -78,69 +90,173 @@ add_library(${PROJECT_NAME} + src/node_constants.cpp + src/node.cpp + src/node_options.cpp +- src/offline_node.cpp + src/playable_bag.cpp + src/ros_log_sink.cpp + src/ros_map.cpp +@@ -78,69 +90,178 @@ add_library(${PROJECT_NAME} src/metrics/family_factory.cpp src/metrics/internal/family.cpp src/metrics/internal/histogram.cpp @@ -169,9 +176,13 @@ index f7f4762..42ec579 100644 + rclcpp::rclcpp +) - add_executable(cartographer_offline_node src/offline_node_main.cpp) +-add_executable(cartographer_offline_node src/offline_node_main.cpp) -target_link_libraries(cartographer_offline_node ${PROJECT_NAME}) -ament_target_dependencies(cartographer_offline_node ${dependencies}) ++# offline_node.cpp defines the same gflags as node_main.cpp and assets_writer_main.cpp; ++# in a shared library every executable would register them twice and abort at startup ++# ("flag 'collect_metrics' was defined more than once") ++add_executable(cartographer_offline_node src/offline_node_main.cpp src/offline_node.cpp) +target_include_directories(cartographer_offline_node PRIVATE + "$" + "$" @@ -182,6 +193,8 @@ index f7f4762..42ec579 100644 + cartographer + gflags + rclcpp::rclcpp ++ ${tf2_msgs_TARGETS} ++ urdf::urdf +) add_executable(cartographer_assets_writer src/assets_writer_main.cpp) @@ -272,7 +285,7 @@ index f7f4762..42ec579 100644 ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin -@@ -158,16 +274,30 @@ install(TARGETS +@@ -158,16 +279,30 @@ install(TARGETS ) install(DIRECTORY include/ diff --git a/distros/lyrical/pkg_additional_info.yaml b/distros/lyrical/pkg_additional_info.yaml index bd035c922..63ca05c34 100644 --- a/distros/lyrical/pkg_additional_info.yaml +++ b/distros/lyrical/pkg_additional_info.yaml @@ -1,5 +1,3 @@ -cartographer_ros: - additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_FLAGS=-DBOOST_ZLIB_BINARY=kernel32" eigenpy: generate_dummy_package_with_run_deps: dep_name: eigenpy @@ -115,6 +113,9 @@ zenoh_cpp_vendor: # Remove build_number fields below on new full rebuild aruco_ros: # its recipe test stops the node for sure (package tests hung on macOS) build_number: 31 +cartographer_ros: + additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_FLAGS=-DBOOST_ZLIB_BINARY=kernel32" + build_number: 31 # offline_node.cpp out of the shared library (duplicate gflags abort) fuse_viz: build_number: 31 grid_map_rviz_plugin: diff --git a/distros/rolling/patch/ros2-cartographer-ros.patch b/distros/rolling/patch/ros2-cartographer-ros.patch index f78d6a65c..c7b1abbe5 100644 --- a/distros/rolling/patch/ros2-cartographer-ros.patch +++ b/distros/rolling/patch/ros2-cartographer-ros.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7f4762..42ec579 100644 +index f7f4762..cd0867b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,16 +28,19 @@ endif() @@ -24,7 +24,7 @@ index f7f4762..42ec579 100644 find_package(rosbag2_cpp REQUIRED) find_package(rosbag2_storage REQUIRED) find_package(sensor_msgs REQUIRED) -@@ -47,17 +50,27 @@ find_package(tf2_eigen REQUIRED) +@@ -47,24 +50,33 @@ find_package(tf2_eigen REQUIRED) find_package(tf2_msgs REQUIRED) find_package(tf2_ros REQUIRED) find_package(urdf REQUIRED) @@ -59,7 +59,14 @@ index f7f4762..42ec579 100644 src/assets_writer.cpp src/map_builder_bridge.cpp src/msg_conversion.cpp -@@ -78,69 +90,173 @@ add_library(${PROJECT_NAME} + src/node_constants.cpp + src/node.cpp + src/node_options.cpp +- src/offline_node.cpp + src/playable_bag.cpp + src/ros_log_sink.cpp + src/ros_map.cpp +@@ -78,69 +90,178 @@ add_library(${PROJECT_NAME} src/metrics/family_factory.cpp src/metrics/internal/family.cpp src/metrics/internal/histogram.cpp @@ -169,9 +176,13 @@ index f7f4762..42ec579 100644 + rclcpp::rclcpp +) - add_executable(cartographer_offline_node src/offline_node_main.cpp) +-add_executable(cartographer_offline_node src/offline_node_main.cpp) -target_link_libraries(cartographer_offline_node ${PROJECT_NAME}) -ament_target_dependencies(cartographer_offline_node ${dependencies}) ++# offline_node.cpp defines the same gflags as node_main.cpp and assets_writer_main.cpp; ++# in a shared library every executable would register them twice and abort at startup ++# ("flag 'collect_metrics' was defined more than once") ++add_executable(cartographer_offline_node src/offline_node_main.cpp src/offline_node.cpp) +target_include_directories(cartographer_offline_node PRIVATE + "$" + "$" @@ -182,6 +193,8 @@ index f7f4762..42ec579 100644 + cartographer + gflags + rclcpp::rclcpp ++ ${tf2_msgs_TARGETS} ++ urdf::urdf +) add_executable(cartographer_assets_writer src/assets_writer_main.cpp) @@ -272,7 +285,7 @@ index f7f4762..42ec579 100644 ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin -@@ -158,16 +274,30 @@ install(TARGETS +@@ -158,16 +279,30 @@ install(TARGETS ) install(DIRECTORY include/ diff --git a/distros/rolling/pkg_additional_info.yaml b/distros/rolling/pkg_additional_info.yaml index 3fd43aa58..bfde2a000 100644 --- a/distros/rolling/pkg_additional_info.yaml +++ b/distros/rolling/pkg_additional_info.yaml @@ -1,5 +1,3 @@ -cartographer_ros: - additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_FLAGS=-DBOOST_ZLIB_BINARY=kernel32" eigenpy: generate_dummy_package_with_run_deps: dep_name: eigenpy @@ -73,6 +71,9 @@ zenoh_cpp_vendor: additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON" aruco_ros: # its recipe test stops the node for sure (package tests hung on macOS) build_number: 33 +cartographer_ros: + additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_FLAGS=-DBOOST_ZLIB_BINARY=kernel32" + build_number: 33 # offline_node.cpp out of the shared library (duplicate gflags abort) fuse_viz: build_number: 33 moveit_ros_visualization: