Skip to content

Commit dab05d0

Browse files
committed
fix: limit rosgraph monitor to linux builds
Move rosgraph_monitor into the existing Linux-only seed set and drop the unsuccessful cross-platform linker workarounds so the branch matches the repo's platform-gating guidance.
1 parent 1a266a0 commit dab05d0

4 files changed

Lines changed: 13 additions & 67 deletions

File tree

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,19 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
@@ -15,17 +15,28 @@
3-
cmake_minimum_required(VERSION 3.8)
4-
project(rmw_stats_shim)
5-
6-
+if(APPLE)
7-
+ string(REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
8-
+ string(REPLACE "--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
9-
+ string(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
10-
+ string(REPLACE "--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
11-
+ string(REPLACE "-latomic" "" CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES}")
12-
+endif()
13-
+
14-
if(NOT CMAKE_CXX_STANDARD)
15-
set(CMAKE_CXX_STANDARD 17)
16-
endif()
17-
18-
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
19-
add_compile_options(-Wall -Wextra -Wpedantic)
20-
- add_link_options("-Wl,--no-undefined")
21-
+ if(NOT APPLE)
22-
+ add_link_options("-Wl,--no-undefined")
23-
+ endif()
24-
endif()
25-
26-
find_package(ament_cmake REQUIRED)
27-
28-
+find_package(Threads REQUIRED)
29-
find_package(rcpputils REQUIRED)
30-
find_package(rmw REQUIRED)
2+
index 8dbdc3b..c2fba66 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -31,6 +31,7 @@ find_package(rmw REQUIRED)
316
find_package(rosgraph_monitor_msgs REQUIRED)
32-
@@ -45,6 +56,7 @@
7+
find_package(rosidl_runtime_cpp REQUIRED)
8+
find_package(rosidl_typesupport_cpp REQUIRED)
9+
+find_package(Threads REQUIRED)
10+
11+
add_library(${PROJECT_NAME} SHARED
12+
src/shim.cpp
13+
@@ -46,6 +47,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
3314
rmw::rmw
3415
rosidl_runtime_cpp::rosidl_runtime_cpp
3516
rosidl_typesupport_cpp::rosidl_typesupport_cpp
3617
+ Threads::Threads
3718
${rosgraph_monitor_msgs_TARGETS}
3819
)
39-

patch/ros-kilted-rosgraph-monitor.patch

Lines changed: 0 additions & 31 deletions
This file was deleted.

pkg_additional_info.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ diagnostic_aggregator:
137137
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
138138
diagnostic_updater:
139139
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
140-
rmw_stats_shim:
141-
additional_cmake_args: "-DCMAKE_SHARED_LINKER_FLAGS= -DCMAKE_MODULE_LINKER_FLAGS="
142-
rosgraph_monitor:
143-
additional_cmake_args: "-DCMAKE_SHARED_LINKER_FLAGS= -DCMAKE_MODULE_LINKER_FLAGS= -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
144140
octomap_ros:
145141
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
146142
rviz_ogre_vendor:

vinca.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ packages_select_by_deps:
9797
- gripper_controllers
9898

9999
- rosbridge_suite
100-
- rosgraph_monitor
101100

102101
- foxglove_bridge
103102
- foxglove_msgs
@@ -167,6 +166,8 @@ packages_select_by_deps:
167166

168167
- libcamera
169168

169+
- rosgraph_monitor
170+
170171
# These packages are currently only build on Linux,
171172
# as trying to build them in the past on macos or Windows resulted in errors
172173
- if: linux

0 commit comments

Comments
 (0)