Skip to content

Commit 8b8c878

Browse files
committed
Revert "Patch Cargo.lock with newew Zenoh commit (#957)"
This did not improve the Windows test result situation This reverts commit 40e4a04.
1 parent 40e4a04 commit 8b8c878

3 files changed

Lines changed: 0 additions & 578 deletions

File tree

zenoh_cpp_vendor/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@ else()
3232
# See https://github.com/eclipse-zenoh/zenoh-c/blob/c1a477d3f5efc3abc0f0cf95e0773225d00dea3b/Cargo.lock#L4229
3333
# pointing to zenoh https://github.com/eclipse-zenoh/zenoh/commit/69b410e705e94531902a41a51b74d0c7b098264c
3434
set(zenoh_c_commit c1a477d3f5efc3abc0f0cf95e0773225d00dea3b)
35-
set(zenoh_c_patches patches-c1a477d3)
3635

3736
# If Rust version below Zenoh MSRV (currently 1.88), use equivalent commit from branch ROS/rust-1.75
3837
# See https://github.com/eclipse-zenoh/zenoh-c/blob/0e3ec084142382096d09f7fc2ad59385998b92e6/Cargo.lock#L4237
3938
# pointing to zenoh https://github.com/eclipse-zenoh/zenoh/commit/f27282e78c6e42e04249349049fa68cfbc941369
4039
if(CARGO_VERSION VERSION_GREATER_EQUAL "1.75" AND CARGO_VERSION VERSION_LESS "1.88")
4140
set(zenoh_c_commit 0e3ec084142382096d09f7fc2ad59385998b92e6)
42-
set(zenoh_c_patches patches-0e3ec084)
4341
endif()
4442

4543
ament_vendor(zenoh_c_vendor
@@ -49,7 +47,6 @@ else()
4947
"-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}"
5048
"-DZENOHC_BUILD_WITH_UNSTABLE_API=TRUE"
5149
"-DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}"
52-
PATCHES "${zenoh_c_patches}"
5350
)
5451

5552
ament_vendor(zenoh_cpp_vendor

zenoh_cpp_vendor/patches-0e3ec084/0001-zenoh-e5db0ce-from-0e3ec084.patch

Lines changed: 0 additions & 292 deletions
This file was deleted.

0 commit comments

Comments
 (0)