From 1f2d6752b762ffca2d451bbd220d1593f9d8b9c2 Mon Sep 17 00:00:00 2001 From: Yuyuan Yuan Date: Fri, 10 Jan 2025 17:06:09 +0800 Subject: [PATCH] chore: Update Zenoh version (#405) This version includes the following fixes: - Fix memory leak in string deserialization ([zenoh-cpp#363](https://github.com/eclipse-zenoh/zenoh-cpp/pull/363)) - Fix SHM Garbage Collection (GC) policy ([zenoh#1696](https://github.com/eclipse-zenoh/zenoh/pull/1696)) - Fix deadlock in advanced subscription undeclaration ([zenoh#1685](https://github.com/eclipse-zenoh/zenoh/pull/1685)) --- zenoh_cpp_vendor/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zenoh_cpp_vendor/CMakeLists.txt b/zenoh_cpp_vendor/CMakeLists.txt index 2d3ae046..57c45fbb 100644 --- a/zenoh_cpp_vendor/CMakeLists.txt +++ b/zenoh_cpp_vendor/CMakeLists.txt @@ -17,9 +17,12 @@ find_package(ament_cmake_vendor_package REQUIRED) # when expanded. set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=shared-memory zenoh/transport_compression zenoh/transport_tcp zenoh/transport_tls") +# Set VCS_VERSION to include latest changes from zenoh/zenoh-c to benefit from : +# - https://github.com/eclipse-zenoh/zenoh/pull/1685 (Fix deadlock in advanced subscription undeclaration) +# - https://github.com/eclipse-zenoh/zenoh/pull/1696 (Fix SHM Garbage Collection (GC) policy) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git - VCS_VERSION 57d5e4d31d9b38fef34d7bcad3d3e54869c4ce73 + VCS_VERSION 61d8fcc136ce4ed36d921a32244da4f3d81a6097 CMAKE_ARGS "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" "-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE" @@ -28,11 +31,12 @@ ament_vendor(zenoh_c_vendor ament_export_dependencies(zenohc) -# Set VCS_VERSION to include latest changes from zenoh-c to benefit from : +# Set VCS_VERSION to include latest changes from zenoh-cpp to benefit from : # - https://github.com/eclipse-zenoh/zenoh-cpp/pull/342 (Fix include what you use) +# - https://github.com/eclipse-zenoh/zenoh-cpp/pull/363 (Fix memory leak in string deserialization) ament_vendor(zenoh_cpp_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp - VCS_VERSION 964b64dc8b935a43147287199e7bb12da7b141e6 + VCS_VERSION 05942637c29d3346ad18bab5a178aeebf4be5d62 CMAKE_ARGS -DZENOHCXX_ZENOHC=OFF )