Add rmw_zenoh_cpp and de-vendor zenoh_cpp_vendor

RoboStack · Jan 22, 2025 · 1c18078 · 1c18078
1 parent 182dda0
commit 1c18078
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 1 deletion.
diff --git a/conda_build_config.yaml b/conda_build_config.yaml
@@ -41,3 +41,8 @@ cxx_compiler:
 cxx_compiler_version:          # [unix]
   - 13                         # [linux]
   - 18                         # [osx]
+
+libzenohc:
+  - 1.1.1
+libzenohcxx:
+  - 1.1.1
diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml
@@ -179,4 +179,8 @@ rosx_introspection:
 octomap_ros:
   add_host: ["octomap"]
 octomap_rviz_plugins:
-  add_host: ["octomap"]
+  add_host: ["octomap"]
+zenoh_cpp_vendor:
+  add_host: ["libzenohc", "libzenohcxx"]
+rmw_zenoh_cpp:
+  add_host: ["libzenohc", "libzenohcxx"]
diff --git a/robostack.yaml b/robostack.yaml
@@ -43,6 +43,8 @@ cartographer:
   robostack: [cartographer]
 ca-certificates:
   robostack: [ca-certificates]
+cargo:
+  robostack: [rust]
 clang-format:
   robostack: [clang-format]
 clang-tidy:

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -181,6 +181,9 @@ packages_select_by_deps:
   # requested in https://github.com/RoboStack/ros-humble/issues/249
   - twist_mux
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/252
+  - rmw_zenoh_cpp
+
   # ----- end of package support -----
 
   # - rtabmap

diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -110,6 +110,9 @@ packages_select_by_deps:
   # requested in https://github.com/RoboStack/ros-humble/issues/249
   - twist_mux
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/252
+  - rmw_zenoh_cpp
+
   # Used to work, now needs fixes
   # - rtabmap
   # - webots-ros2

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -132,5 +132,8 @@ packages_select_by_deps:
   # requested in https://github.com/RoboStack/ros-humble/issues/249
   - twist_mux
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/252
+  - rmw_zenoh_cpp
+
 patch_dir: patch
 rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -122,5 +122,8 @@ packages_select_by_deps:
   # requested in https://github.com/RoboStack/ros-humble/issues/249
   - twist_mux
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/252
+  - rmw_zenoh_cpp
+
 patch_dir: patch
 rosdistro_snapshot: rosdistro_snapshot.yaml
diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -246,5 +246,8 @@ packages_select_by_deps:
   # requested in https://github.com/RoboStack/ros-humble/issues/249
   - twist_mux
 
+  # requested in https://github.com/RoboStack/ros-humble/issues/252
+  - rmw_zenoh_cpp
+
 patch_dir: patch
 rosdistro_snapshot: rosdistro_snapshot.yaml