Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ros: Remove ImageMarkerArray #251

Merged
merged 5 commits into from
Mar 1, 2025
Merged

ros: Remove ImageMarkerArray #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b95de6e
Remove ImageMarkerArray
amacneil Feb 27, 2025
9b773f1
remove visualization_msgs dependency
amacneil Feb 27, 2025
b8c91cb
add ros2 missing builtin_interfaces dependency
amacneil Feb 27, 2025
2a6940b
Merge branch 'main' of github.com:foxglove/foxglove-sdk into adrian/r…
amacneil Mar 1, 2025
ebb5f01
builtin_interfaces required for ros 2 only
amacneil Mar 1, 2025
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
9 changes: 3 additions & 6 deletions ros/foxglove_msgs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ if(${ROS_VERSION} EQUAL 1)
find_package(catkin REQUIRED
COMPONENTS
message_generation
visualization_msgs
geometry_msgs
)

Expand All @@ -24,7 +23,6 @@ if(${ROS_VERSION} EQUAL 1)
file(REMOVE_RECURSE msg)
file(COPY
${_generated_ros1_schemas}
ImageMarkerArray.msg
DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/msg"
)

Expand All @@ -36,7 +34,7 @@ if(${ROS_VERSION} EQUAL 1)

add_message_files(DIRECTORY msg)

generate_messages(DEPENDENCIES visualization_msgs geometry_msgs)
generate_messages(DEPENDENCIES geometry_msgs)

catkin_package(CATKIN_DEPENDS message_runtime)

Expand All @@ -58,7 +56,7 @@ elseif(${ROS_VERSION} EQUAL 2)
endif()

find_package(ament_cmake REQUIRED)
find_package(visualization_msgs REQUIRED)
find_package(builtin_interfaces REQUIRED)
find_package(geometry_msgs REQUIRED)
find_package(rosidl_default_generators REQUIRED)

Expand All @@ -69,7 +67,6 @@ elseif(${ROS_VERSION} EQUAL 2)
file(REMOVE_RECURSE msg)
file(COPY
${_generated_ros2_schemas}
ImageMarkerArray.msg
DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/msg"
)

Expand All @@ -81,7 +78,7 @@ elseif(${ROS_VERSION} EQUAL 2)

rosidl_generate_interfaces(${PROJECT_NAME}
${_all_msg_files}
DEPENDENCIES visualization_msgs geometry_msgs
DEPENDENCIES builtin_interfaces geometry_msgs
ADD_LINTER_TESTS
)

Expand Down
1 change: 0 additions & 1 deletion ros/foxglove_msgs/ImageMarkerArray.msg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ros/foxglove_msgs/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<build_depend condition="$ROS_VERSION == 2">rosidl_default_generators</build_depend>
<build_depend>ros_environment</build_depend>

<depend>visualization_msgs</depend>
<depend condition="$ROS_VERSION == 2">builtin_interfaces</depend>
<depend>geometry_msgs</depend>

<exec_depend condition="$ROS_VERSION == 1">message_runtime</exec_depend>
Expand Down