From f9088053ab7ed97e06d2c58f6f66c6ce2dfd5dec Mon Sep 17 00:00:00 2001 From: Hunter Baker Date: Sun, 8 Nov 2026 19:15:08 -0800 Subject: [PATCH] fix(zenoh): px4_sitl_zenoh build on macOS (#29538) zenoh is now part of px4_sitl_default, so the macOS SITL build compiles it and fails in two places: - msg: zenoh_topics was a static library with only a header as its source. macOS ar rejects the resulting empty archive ("no archive members specified"). It only orders header generation, so make it a custom target. - zenoh: POSIX_COMPATIBLE makes zenoh-pico define ZENOH_LINUX ahead of its own Darwin detection, which pulls in the Linux-only getrandom(). Set it only on non-Apple platforms. Linux is unaffected, and NuttX (CMAKE_SYSTEM_NAME Generic) keeps it. Also mark the uORB_Zenoh_Subscriber overrides, consistent with the publisher. Signed-off-by: Beniamino Pozzan Co-authored-by: Farhang <46557204+farhangnaderi@users.noreply.github.com> Co-authored-by: Beniamino Pozzan --- msg/CMakeLists.txt | 7 ++++--- src/modules/zenoh/CMakeLists.txt | 4 +++- src/modules/zenoh/subscribers/uorb_subscriber.hpp | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/msg/CMakeLists.txt b/msg/CMakeLists.txt index 4db75e68d84..0f62315b2c6 100644 --- a/msg/CMakeLists.txt +++ b/msg/CMakeLists.txt @@ -624,7 +624,8 @@ if(CONFIG_MODULES_ZENOH) COMMENT "Generating Zenoh Topic Code" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM - ) - add_library(zenoh_topics ${PX4_BINARY_DIR}/src/modules/zenoh/uorb_pubsub_factory.hpp) - set_target_properties(zenoh_topics PROPERTIES LINKER_LANGUAGE CXX) + ) + add_custom_target(zenoh_topics + DEPENDS ${PX4_BINARY_DIR}/src/modules/zenoh/uorb_pubsub_factory.hpp + ) endif() diff --git a/src/modules/zenoh/CMakeLists.txt b/src/modules/zenoh/CMakeLists.txt index 9e576d17871..f927bae2504 100644 --- a/src/modules/zenoh/CMakeLists.txt +++ b/src/modules/zenoh/CMakeLists.txt @@ -37,7 +37,9 @@ function(message) endif() endfunction() -set(POSIX_COMPATIBLE YES) +if(NOT APPLE) + set(POSIX_COMPATIBLE YES) +endif() set(BUILD_SHARED_LIBS OFF) set(BUILD_TESTING OFF) set(CHECK_THREADS NO) diff --git a/src/modules/zenoh/subscribers/uorb_subscriber.hpp b/src/modules/zenoh/subscribers/uorb_subscriber.hpp index 8843aee6c96..649445340f4 100644 --- a/src/modules/zenoh/subscribers/uorb_subscriber.hpp +++ b/src/modules/zenoh/subscribers/uorb_subscriber.hpp @@ -73,7 +73,7 @@ public: } // Update the uORB Subscription and broadcast a Zenoh ROS2 message - void data_handler(const z_loaned_sample_t *sample) + void data_handler(const z_loaned_sample_t *sample) override { char data[_uorb_meta->o_size + CDR_SAFETY_MARGIN]; @@ -133,7 +133,7 @@ public: memcpy(data, &now, sizeof(hrt_abstime)); } - void print() + void print() override { Zenoh_Subscriber::print("uORB", _uorb_meta->o_name); }