Skip to content

zenoh_cpp_vendor: Do not call externalproject_add_stepdependencies if projects are not vendored #695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: rolling
Choose a base branch
from
Draft

zenoh_cpp_vendor: Do not call externalproject_add_stepdependencies if projects are not vendored #695

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67a1b3b
zenoh_cpp_vendor: Do not call externalproject_add_stepdependencies if…
traversaro Jul 3, 2025
07e2e2b
Set IS_VENDORED variables to TRUE as default
traversaro Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion zenoh_cpp_vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--features=shared-memor
# - https://github.com/eclipse-zenoh/zenoh/pull/1914
# - Add support for DiffServ's DSCP config for endpoints:
# - https://github.com/eclipse-zenoh/zenoh/pull/1937
set(ZENOH_C_IS_VENDORED TRUE)
ament_vendor(zenoh_c_vendor
VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git
VCS_VERSION 6bea1f1ebc29412548f36af91cf2225c8bf476d4
Expand All @@ -37,18 +38,23 @@ ament_vendor(zenoh_c_vendor
"-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE"
"-DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}"
PATCHES ${CMAKE_CURRENT_SOURCE_DIR}/pin-rust-1.75.0.patch
IS_VENDORED_OUTPUT_VARIABLE_NAME ZENOH_C_IS_VENDORED
)

ament_export_dependencies(zenohc)

set(ZENOH_CPP_IS_VENDORED TRUE)
ament_vendor(zenoh_cpp_vendor
VCS_URL https://github.com/eclipse-zenoh/zenoh-cpp
VCS_VERSION 7379592436398079934f4296d2fa90217f8eddf9
CMAKE_ARGS
-DZENOHCXX_ZENOHC=OFF
IS_VENDORED_OUTPUT_VARIABLE_NAME ZENOH_CPP_IS_VENDORED
)

externalproject_add_stepdependencies(zenoh_cpp_vendor configure zenoh_c_vendor)
if(ZENOH_C_IS_VENDORED AND ZENOH_CPP_IS_VENDORED)
externalproject_add_stepdependencies(zenoh_cpp_vendor configure zenoh_c_vendor)
endif()

ament_export_dependencies(zenohcxx)

Expand Down