mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-11-22 14:19:57 +08:00
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 <beniamino.pozzan@gmail.com>
Co-authored-by: Farhang <46557204+farhangnaderi@users.noreply.github.com>
Co-authored-by: Beniamino Pozzan <beniamino.pozzan@gmail.com>
This commit is contained in:
3 files changed
+9
-6
No files matched your search
+4
-3
@@ -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()
|
||||
Reference in new issue
Block a user