Skip to content

Commit

Permalink
chore: Update Zenoh version (#405)
Browse files Browse the repository at this point in the history
This version includes the following fixes:
- Fix memory leak in string deserialization ([zenoh-cpp#363](eclipse-zenoh/zenoh-cpp#363))
- Fix SHM Garbage Collection (GC) policy ([zenoh#1696](eclipse-zenoh/zenoh#1696))
- Fix deadlock in advanced subscription undeclaration ([zenoh#1685](eclipse-zenoh/zenoh#1685))
  • Loading branch information
YuanYuYuan authored Jan 10, 2025
1 parent 660b1b0 commit 1f2d675
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions zenoh_cpp_vendor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ find_package(ament_cmake_vendor_package REQUIRED)
# when expanded.
set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--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"
Expand All @@ -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
)
Expand Down

0 comments on commit 1f2d675

Please sign in to comment.