From 55aa2e50ffeabe9a7c849d170ac127598ce50f2f Mon Sep 17 00:00:00 2001 From: Peter van der Perk Date: Wed, 10 Mar 2021 19:02:51 +0100 Subject: [PATCH] UAVCANv1 menuconfig make it board label configurable --- src/drivers/uavcan_v1/CMakeLists.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/drivers/uavcan_v1/CMakeLists.txt b/src/drivers/uavcan_v1/CMakeLists.txt index 12d3883830..8691fcf5ba 100644 --- a/src/drivers/uavcan_v1/CMakeLists.txt +++ b/src/drivers/uavcan_v1/CMakeLists.txt @@ -31,7 +31,7 @@ # ############################################################################ -set(UAVCAN_DEFCONFIG ${PX4_BOARD_DIR}/uavcanconfig CACHE FILEPATH "path to defconfig" FORCE) +set(UAVCAN_DEFCONFIG ${PX4_BOARD_DIR}/${PX4_BOARD_LABEL}-uavcanconfig CACHE FILEPATH "path to defconfig" FORCE) set(LIBCANARD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libcanard) set(DSDL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/public_regulated_data_types) @@ -111,15 +111,19 @@ px4_add_module( # Use uavcanconfig file for compile definitions -file(STRINGS ${UAVCAN_DEFCONFIG} lines) +if(EXISTS ${UAVCAN_DEFCONFIG}) + file(STRINGS ${UAVCAN_DEFCONFIG} lines) -FOREACH(i IN LISTS lines) - if(i MATCHES "#") - else() - string(REPLACE "\n" "" i ${i}) - SET(uavcan_config "${uavcan_config}${i};") - endif() -ENDFOREACH() + FOREACH(i IN LISTS lines) + if(i MATCHES "#") + else() + string(REPLACE "\n" "" i ${i}) + SET(uavcan_config "${uavcan_config}${i};") + endif() + ENDFOREACH() +else() + file(TOUCH ${UAVCAN_DEFCONFIG} lines) +endif() target_compile_definitions(drivers__uavcan_v1 PRIVATE ${uavcan_config})