From be5c5856e79fb6bf0e14ce3fc708b405f04e253b Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 27 Oct 2021 12:32:46 -0400 Subject: [PATCH] cmake: px4_add_module always add module to PX4_MODULE_PATHS so that parameters aren't pruned --- cmake/px4_add_module.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/px4_add_module.cmake b/cmake/px4_add_module.cmake index 660b2e622d..aa75a00d4d 100644 --- a/cmake/px4_add_module.cmake +++ b/cmake/px4_add_module.cmake @@ -156,11 +156,12 @@ function(px4_add_module) if(NOT DYNAMIC) target_link_libraries(${MODULE} PRIVATE prebuild_targets parameters_interface px4_layer px4_platform systemlib) set_property(GLOBAL APPEND PROPERTY PX4_MODULE_LIBRARIES ${MODULE}) - set_property(GLOBAL APPEND PROPERTY PX4_MODULE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}) - px4_list_make_absolute(ABS_SRCS ${CMAKE_CURRENT_SOURCE_DIR} ${SRCS}) - set_property(GLOBAL APPEND PROPERTY PX4_SRC_FILES ${ABS_SRCS}) endif() + set_property(GLOBAL APPEND PROPERTY PX4_MODULE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}) + px4_list_make_absolute(ABS_SRCS ${CMAKE_CURRENT_SOURCE_DIR} ${SRCS}) + set_property(GLOBAL APPEND PROPERTY PX4_SRC_FILES ${ABS_SRCS}) + # set defaults if not set set(MAIN_DEFAULT MAIN-NOTFOUND) set(STACK_MAIN_DEFAULT 2048)