From 83a26f2d1911bbb61c786f445b3f4477e20e969b Mon Sep 17 00:00:00 2001 From: yuanyuyuan Date: Thu, 29 Aug 2024 22:00:14 +0800 Subject: [PATCH 1/2] build: deprecate the zenohc_debug and incldue the zenohc dependency in the zenoh_c_vendor --- rmw_zenoh_cpp/CMakeLists.txt | 4 ---- zenoh_c_vendor/CMakeLists.txt | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rmw_zenoh_cpp/CMakeLists.txt b/rmw_zenoh_cpp/CMakeLists.txt index 4ecfe360..a8674797 100644 --- a/rmw_zenoh_cpp/CMakeLists.txt +++ b/rmw_zenoh_cpp/CMakeLists.txt @@ -22,10 +22,6 @@ find_package(rosidl_typesupport_fastrtps_c REQUIRED) find_package(rosidl_typesupport_fastrtps_cpp REQUIRED) find_package(rmw REQUIRED) find_package(zenoh_c_vendor REQUIRED) -find_package(zenohc_debug QUIET) -if(NOT zenohc_debug_FOUND) - find_package(zenohc REQUIRED) -endif() add_library(rmw_zenoh_cpp SHARED src/detail/attachment_helpers.cpp diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt index f1870337..8f819c1f 100644 --- a/zenoh_c_vendor/CMakeLists.txt +++ b/zenoh_c_vendor/CMakeLists.txt @@ -31,4 +31,6 @@ ament_vendor(zenoh_c_vendor "-DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}" ) +ament_export_dependencies(zenohc) + ament_package() From 31a76fde0910b07a015d42171b974b4cc53a5502 Mon Sep 17 00:00:00 2001 From: ChenYing Kuo Date: Mon, 2 Sep 2024 14:30:47 +0800 Subject: [PATCH 2/2] Use main branch for upgrading to Zenoh 1.0 Signed-off-by: ChenYing Kuo --- zenoh_c_vendor/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt index 8f819c1f..263ab7fe 100644 --- a/zenoh_c_vendor/CMakeLists.txt +++ b/zenoh_c_vendor/CMakeLists.txt @@ -25,7 +25,7 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=shared-memor # - https://github.com/eclipse-zenoh/zenoh/pull/1150 (fix deadlock issue https://github.com/ros2/rmw_zenoh/issues/182) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c - VCS_VERSION dev/1.0.0 + VCS_VERSION main CMAKE_ARGS "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" "-DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}"