From e1f2bff9be501d853f109963bf03eb294efbbedc Mon Sep 17 00:00:00 2001 From: Jukka Laitinen Date: Mon, 11 Jan 2021 09:59:17 +0200 Subject: [PATCH] Fix parameters building for nuttx protected/kernel builds - Don't link to px4_layer - Don't link to flashparams; flashparams would work only in kernel side - Add missing link to px4_platform Signed-off-by: Jukka Laitinen --- src/lib/parameters/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/parameters/CMakeLists.txt b/src/lib/parameters/CMakeLists.txt index 26e909596f..20b315994b 100644 --- a/src/lib/parameters/CMakeLists.txt +++ b/src/lib/parameters/CMakeLists.txt @@ -167,7 +167,8 @@ if (NOT "${PX4_BOARD}" MATCHES "px4_io") px4_parameters.hpp ) - target_link_libraries(parameters PRIVATE perf tinybson px4_layer) + target_link_libraries(parameters PRIVATE perf tinybson px4_platform) + target_compile_definitions(parameters PRIVATE -DMODULE_NAME="parameters") target_compile_options(parameters PRIVATE @@ -180,7 +181,7 @@ else() endif() add_dependencies(parameters prebuild_targets) -if(${PX4_PLATFORM} STREQUAL "nuttx") +if(${PX4_PLATFORM} STREQUAL "nuttx" AND CONFIG_BUILD_FLAT) target_link_libraries(parameters PRIVATE flashparams tinybson) endif()