From d71219bea7c0f1f138f240e5f9b9caf8244b875a Mon Sep 17 00:00:00 2001 From: Peter van der Perk Date: Wed, 10 Aug 2022 12:38:51 +0200 Subject: [PATCH] nuttx_mm only for nuttx based targets --- platforms/common/uORB/CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/platforms/common/uORB/CMakeLists.txt b/platforms/common/uORB/CMakeLists.txt index 39d5bad327..1ebe11561b 100644 --- a/platforms/common/uORB/CMakeLists.txt +++ b/platforms/common/uORB/CMakeLists.txt @@ -73,21 +73,29 @@ if (NOT DEFINED CONFIG_BUILD_FLAT AND "${PX4_PLATFORM}" MATCHES "nuttx") ${SRCS_KERNEL} ) target_link_libraries(uORB_kernel PRIVATE cdev uorb_msgs) - target_compile_options(uORB_kernel PRIVATE ${MAX_CUSTOM_OPT_LEVEL} -D__KERNEL__) + target_compile_options(uORB_kernel PRIVATE ${MAX_CUSTOM_OPT_LEVEL} -D__KERNEL__ nuttx_mm) # User side library in nuttx kernel/protected build px4_add_library(uORB ${SRCS_COMMON} ${SRCS_USER} ) -else() +elseif("${PX4_PLATFORM}" MATCHES "nuttx") - # Library for all other targets (flat build, posix...) + # Library for NuttX (flat build, posix...) px4_add_library(uORB ${SRCS_COMMON} ${SRCS_KERNEL} ) target_link_libraries(uORB PRIVATE cdev nuttx_mm) +else() + + # Library for all other targets (posix...) + px4_add_library(uORB + ${SRCS_COMMON} + ${SRCS_KERNEL} + ) + target_link_libraries(uORB PRIVATE cdev) endif() target_link_libraries(uORB PRIVATE uorb_msgs)