|
| 1 | +diff --git a/zenoh_cpp_vendor/CMakeLists.txt b/zenoh_cpp_vendor/CMakeLists.txt |
| 2 | +index 2d3ae046..de971841 100644 |
| 3 | +--- a/zenoh_cpp_vendor/CMakeLists.txt |
| 4 | ++++ b/zenoh_cpp_vendor/CMakeLists.txt |
| 5 | +@@ -10,35 +10,10 @@ endif() |
| 6 | + find_package(ament_cmake REQUIRED) |
| 7 | + find_package(ament_cmake_vendor_package REQUIRED) |
| 8 | + |
| 9 | +-# Disable default features and enable only the most useful ones. This reduces build time and footprint. |
| 10 | +-# For a complete list of features see: https://github.com/eclipse-zenoh/zenoh/blob/main/zenoh/Cargo.toml |
| 11 | +-# Note: We separate the two args needed for cargo with "$<SEMICOLON>" and not ";" as the |
| 12 | +-# latter is a list separater in cmake and hence the string will be split into two |
| 13 | +-# when expanded. |
| 14 | +-set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--features=shared-memory zenoh/transport_compression zenoh/transport_tcp zenoh/transport_tls") |
| 15 | +- |
| 16 | +-ament_vendor(zenoh_c_vendor |
| 17 | +- VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git |
| 18 | +- VCS_VERSION 57d5e4d31d9b38fef34d7bcad3d3e54869c4ce73 |
| 19 | +- CMAKE_ARGS |
| 20 | +- "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" |
| 21 | +- "-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE" |
| 22 | +- "-DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}" |
| 23 | +-) |
| 24 | +- |
| 25 | ++find_package(zenohc REQUIRED) |
| 26 | + ament_export_dependencies(zenohc) |
| 27 | + |
| 28 | +-# Set VCS_VERSION to include latest changes from zenoh-c to benefit from : |
| 29 | +-# - https://github.com/eclipse-zenoh/zenoh-cpp/pull/342 (Fix include what you use) |
| 30 | +-ament_vendor(zenoh_cpp_vendor |
| 31 | +- VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp |
| 32 | +- VCS_VERSION 964b64dc8b935a43147287199e7bb12da7b141e6 |
| 33 | +- CMAKE_ARGS |
| 34 | +- -DZENOHCXX_ZENOHC=OFF |
| 35 | +-) |
| 36 | +- |
| 37 | +-externalproject_add_stepdependencies(zenoh_cpp_vendor configure zenoh_c_vendor) |
| 38 | +- |
| 39 | ++find_package(zenohcxx REQUIRED) |
| 40 | + ament_export_dependencies(zenohcxx) |
| 41 | + |
| 42 | + ament_package() |
0 commit comments