From 4ebe5fb18fae9f330fe9612bb4a4406abefe03c2 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Mon, 15 Jul 2024 11:59:05 +0800 Subject: [PATCH] Update Cmakelist --- radio/src/targets/pl18/CMakeLists.txt | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/radio/src/targets/pl18/CMakeLists.txt b/radio/src/targets/pl18/CMakeLists.txt index cb3215533..14797a9c5 100644 --- a/radio/src/targets/pl18/CMakeLists.txt +++ b/radio/src/targets/pl18/CMakeLists.txt @@ -128,19 +128,11 @@ set(BOARD_COMMON_SRC ) if(ROTARY_ENCODER) - list(APPEND BOARD_COMMON_SRC + set(BOARD_COMMON_SRC ${BOARD_COMMON_SRC} targets/common/arm/stm32/rotary_encoder_driver.cpp ) endif() -if(PCBREV STREQUAL NB4P) - set(BOARD_SPECIFIC_SRC - ${TARGET_SRC_DIR}/switch_driver.cpp - ) -#else() -# set(BOARD_SPECIFIC_SRC) -endif() - # Bootloader board library add_library(board_bl OBJECT EXCLUDE_FROM_ALL ${BOARD_COMMON_SRC} @@ -167,12 +159,14 @@ add_library(board OBJECT EXCLUDE_FROM_ALL targets/common/arm/stm32/trainer_driver.cpp targets/common/arm/stm32/spi_flash.cpp targets/common/arm/stm32/diskio_spi_flash.cpp - drivers/frftl.cpp - + drivers/frftl.cpp ) - set(FIRMWARE_SRC ${FIRMWARE_SRC} $) +if(PCBREV STREQUAL NB4P) + target_sources(board PRIVATE ${TARGET_SRC_DIR}/switch_driver.cpp) +endif() + set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common/arm/loadboot.cpp