Skip to content
Merged
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
5 changes: 5 additions & 0 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,11 @@ wasm_cpp:
aws_sdk_cpp_vendor:
add_host: ["aws-sdk-cpp"]
add_run: ["aws-sdk-cpp"]
polygon_rviz_plugins:
add_host: ["libgl-devel"]
add_run: ["libgl-devel"]
py_trees:
add_host: ["poetry-core"]
# Workaround for https://github.com/frankarobotics/franka_ros2/pull/169
franka_hardware:
add_host: ["ros-humble-rclcpp-action", "ros-humble-rclcpp-components"]
Expand Down
14 changes: 14 additions & 0 deletions patch/ros-humble-color-util.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc98189..71ce465 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,9 @@ find_package(ament_cmake REQUIRED)
find_package(std_msgs REQUIRED)

add_library(color_util src/convert.cpp)
+if(WIN32 AND MSVC)
+ set_target_properties(color_util PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
target_include_directories(color_util PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
14 changes: 14 additions & 0 deletions patch/ros-humble-polygon-utils.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc98189..71ce465 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,9 @@ find_package(geometry_msgs REQUIRED)
find_package(polygon_msgs REQUIRED)

add_library(polygon_utils src/polygon_utils.cpp)
+if(WIN32 AND MSVC)
+ set_target_properties(polygon_utils PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
target_include_directories(polygon_utils PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
13 changes: 13 additions & 0 deletions vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ packages_skip_by_deps:
- osrf_testing_tools_cpp
- if: win
then:
- rclc_examples
# Modern gz-sim integration is not supported on Humble on Windows, please
# look to Jazzy or Kilted if you are interested in it, see
# https://github.com/RoboStack/ros-humble/issues/68
Expand Down Expand Up @@ -93,6 +94,7 @@ packages_remove_from_deps:
- osrf_testing_tools_cpp
- if: win
then:
- rclc_examples
# Modern gz-sim integration is not supported on Humble on Windows, please
# look to Jazzy or Kilted if you are interested in it, see
# https://github.com/RoboStack/ros-humble/issues/68
Expand Down Expand Up @@ -317,6 +319,17 @@ packages_select_by_deps:
- imu_tools
- rplidar_ros
- vector_pursuit_controller
- imu_transformer
- imu_calib
- polygon_msgs
- polygon_utils
- color_util
- rclc_parameter
- rclc_lifecycle
- rclc_examples
- ptz_action_server_msgs
- py_trees

# Requested in https://github.com/RoboStack/ros-humble/issues/345
- topic_based_ros2_control
# IntelRealSense
Expand Down
Loading