diff --git a/src/lib/cdrstream/CMakeLists.txt b/src/lib/cdrstream/CMakeLists.txt index cfdb6ab0902..1e978baa56b 100644 --- a/src/lib/cdrstream/CMakeLists.txt +++ b/src/lib/cdrstream/CMakeLists.txt @@ -44,6 +44,10 @@ if(CONFIG_LIB_CDRSTREAM) px4_add_git_submodule(TARGET git_cyclonedds PATH "cyclonedds") px4_add_git_submodule(TARGET git_rosidl PATH "rosidl") add_dependencies(cdr git_cyclonedds git_rosidl uorb_headers parameters px4_platform) - target_sources(cdr PRIVATE dds_serializer.c) + # bswap.c holds the external definitions of the inline byte-swap helpers, + # needed when they are not inlined (e.g. -O0 sanitizer builds) + target_sources(cdr PRIVATE + dds_serializer.c + ${CMAKE_CURRENT_LIST_DIR}/cyclonedds/src/ddsrt/src/bswap.c) target_include_directories(cdr PUBLIC ${CMAKE_CURRENT_LIST_DIR}) endif() diff --git a/src/modules/zenoh/CMakeLists.txt b/src/modules/zenoh/CMakeLists.txt index cb6908d977b..60ae506dad0 100644 --- a/src/modules/zenoh/CMakeLists.txt +++ b/src/modules/zenoh/CMakeLists.txt @@ -77,7 +77,8 @@ target_compile_options(zenohpico_static PUBLIC -Wno-cast-align -Wno-conversion -Wno-float-equal) -target_compile_options(zenohpico_static PRIVATE -Wno-missing-prototypes) +target_compile_options(zenohpico_static PRIVATE -Wno-missing-prototypes + -Wno-return-type) # false positive at -O0 (sanitizer builds) if(CONFIG_PLATFORM_NUTTX) target_compile_options(zenohpico_static PRIVATE -DUNIX_NO_MULTICAST_IF) endif()