From e8fa94126eb807cf59abbb532d1899a6e1a3f475 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 27 May 2018 14:36:41 -0400 Subject: [PATCH] set MODULE_NAME for parameters library and external ecl libraries (#9536) --- src/lib/ecl | 2 +- src/lib/parameters/CMakeLists.txt | 1 + src/lib/parameters/flashparams/CMakeLists.txt | 1 + src/lib/parameters/tinybson/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/ecl b/src/lib/ecl index 50631e5d98..a80b3ab610 160000 --- a/src/lib/ecl +++ b/src/lib/ecl @@ -1 +1 @@ -Subproject commit 50631e5d98e61093e85e798570503e4055e887ca +Subproject commit a80b3ab610f80319f63c6224f77b30cfedb93ccb diff --git a/src/lib/parameters/CMakeLists.txt b/src/lib/parameters/CMakeLists.txt index 5b3d889b27..ebe5c4cafa 100644 --- a/src/lib/parameters/CMakeLists.txt +++ b/src/lib/parameters/CMakeLists.txt @@ -129,6 +129,7 @@ if (NOT "${CONFIG}" MATCHES "px4io") endif() target_link_libraries(parameters PRIVATE perf tinybson) + target_compile_definitions(parameters PRIVATE -DMODULE_NAME="parameters") target_compile_options(parameters PRIVATE -Wno-sign-compare) # TODO: fix this else() add_library(parameters ${PX4_SOURCE_DIR}/src/platforms/empty.c) diff --git a/src/lib/parameters/flashparams/CMakeLists.txt b/src/lib/parameters/flashparams/CMakeLists.txt index c9819eb48a..5e91b7d326 100644 --- a/src/lib/parameters/flashparams/CMakeLists.txt +++ b/src/lib/parameters/flashparams/CMakeLists.txt @@ -36,5 +36,6 @@ add_library(flashparams flashparams.c ) add_dependencies(flashparams prebuild_targets) +target_compile_definitions(flashparams PRIVATE -DMODULE_NAME="flashparams") target_compile_options(flashparams PRIVATE -Wno-sign-compare) # TODO: fix this target_link_libraries(flashparams PRIVATE nuttx_arch) \ No newline at end of file diff --git a/src/lib/parameters/tinybson/CMakeLists.txt b/src/lib/parameters/tinybson/CMakeLists.txt index 15c45008cf..8fb9a8c1f7 100644 --- a/src/lib/parameters/tinybson/CMakeLists.txt +++ b/src/lib/parameters/tinybson/CMakeLists.txt @@ -32,5 +32,6 @@ ############################################################################ add_library(tinybson tinybson.c) +target_compile_definitions(tinybson PRIVATE -DMODULE_NAME="tinybson") target_compile_options(tinybson PRIVATE -Wno-sign-compare) # TODO: fix this add_dependencies(tinybson prebuild_targets)