Merge branch 'dev/1.0.0' into dev/1.0.0-ci

Signed-off-by: ChenYing Kuo <[email protected]>
ZettaScaleLabs · Sep 2, 2024 · c983149 · c983149
2 parents 28a930a + 7dba674
commit c983149
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/rmw_zenoh_cpp/CMakeLists.txt b/rmw_zenoh_cpp/CMakeLists.txt
@@ -22,10 +22,6 @@ find_package(rosidl_typesupport_fastrtps_c REQUIRED)
 find_package(rosidl_typesupport_fastrtps_cpp REQUIRED)
 find_package(rmw REQUIRED)
 find_package(zenoh_c_vendor REQUIRED)
-find_package(zenohc_debug QUIET)
-if(NOT zenohc_debug_FOUND)
-  find_package(zenohc REQUIRED)
-endif()
 
 add_library(rmw_zenoh_cpp SHARED
   src/detail/attachment_helpers.cpp

diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt
@@ -25,7 +25,7 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$<SEMICOLON>--features=shared-memor
 # - https://github.com/eclipse-zenoh/zenoh/pull/1150 (fix deadlock issue https://github.com/ros2/rmw_zenoh/issues/182)
 # ament_vendor(zenoh_c_vendor
 #   VCS_URL https://github.com/eclipse-zenoh/zenoh-c
-#   VCS_VERSION dev/1.0.0
+#   VCS_VERSION main
 #   CMAKE_ARGS
 #     "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}"
 #     "-DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}"
@@ -36,7 +36,7 @@ set(ZENOHC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
 ExternalProject_Add(zenohc
   PREFIX ${CMAKE_BINARY_DIR}/zenohc
   GIT_REPOSITORY https://github.com/eclipse-zenoh/zenoh-c.git
-  GIT_TAG dev/1.0.0
+  GIT_TAG main
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${ZENOHC_INSTALL_DIR} -DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS} -DZENOHC_CUSTOM_TARGET=${ZENOHC_CUSTOM_TARGET}
   BUILD_IN_SOURCE 1
 )
@@ -45,4 +45,6 @@ add_custom_target(zenoh_c_vendor ALL
 )
 list(APPEND CMAKE_PREFIX_PATH ${ZENOHC_INSTALL_DIR})
 
-ament_package()
+ament_export_dependencies(zenohc)
+
+ament_package()