From b8335b994f797a737d1bdc4aa071ca25c38687d5 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 26 Nov 2021 09:25:20 +0100 Subject: [PATCH] Make list of supported internal module configurable per cmake option Resolves #1159 --- radio/src/targets/common/arm/CMakeLists.txt | 4 +++- radio/src/targets/horus/CMakeLists.txt | 2 +- radio/src/targets/nv14/CMakeLists.txt | 2 +- radio/src/targets/taranis/CMakeLists.txt | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt index 57e389b6f..7fe68eed2 100644 --- a/radio/src/targets/common/arm/CMakeLists.txt +++ b/radio/src/targets/common/arm/CMakeLists.txt @@ -30,8 +30,10 @@ set_property(CACHE DEFAULT_INTERNAL_MODULE PROPERTY STRINGS ${INTERNAL_MODULES}) # define variables for internal modules foreach(module ${INTERNAL_MODULES}) - message("-- Adding support for ${module} as internal module") set(INTERNAL_MODULE_${module} ON CACHE BOOL "Support for ${module} internal module") + if (INTERNAL_MODULE_${module}) + message("-- Adding support for ${module} as internal module") + endif() endforeach() if(INTERNAL_MODULE_PXX1) diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 8f2040c8e..8a675417d 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -49,7 +49,7 @@ endif() add_definitions(-DPCBFRSKY) # defines existing internal modules -set(INTERNAL_MODULES PXX1 PXX2 MULTI CRSF) +set(INTERNAL_MODULES PXX1;PXX2;MULTI;CRSF CACHE STRING "Internal modules") # VCP CLI set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt index 711f75262..7d57153ab 100644 --- a/radio/src/targets/nv14/CMakeLists.txt +++ b/radio/src/targets/nv14/CMakeLists.txt @@ -50,7 +50,7 @@ add_definitions(-DBATTERY_CHARGE) # -DSOFTWARE_VOLUME add_definitions(-DINTERNAL_MODULE_AFHDS2A) # defines existing internal modules -set(INTERNAL_MODULES AFHDS2A) +set(INTERNAL_MODULES AFHDS2A CACHE STRING "Internal modules") set(DEFAULT_INTERNAL_MODULE FLYSKY CACHE STRING "Default internal module") set(TARGET_SRC diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index bc54a4e2a..907e47cd4 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -357,10 +357,10 @@ if(INTERNAL_MODULE_SERIAL) if("${PCBREV}" STREQUAL 2019 OR "${PCBREV}" STREQUAL ACCESS) # defines existing internal modules - set(INTERNAL_MODULES PXX2) + set(INTERNAL_MODULES PXX2 CACHE STRING "Internal modules") else() # defines existing internal modules - set(INTERNAL_MODULES PXX1 PXX2 MULTI CRSF) + set(INTERNAL_MODULES PXX1;PXX2;MULTI;CRSF CACHE STRING "Internal modules") endif() add_definitions(-DINTERNAL_MODULE_SERIAL)