From 2e797c3a32e6ad3826fac49f9403ec2dcdd4b036 Mon Sep 17 00:00:00 2001 From: Jamie Smith Date: Sun, 5 Jun 2022 13:30:47 -0700 Subject: [PATCH] Convert 802.15.4 and nfc to STATIC --- connectivity/CMakeLists.txt | 8 +++----- connectivity/drivers/802.15.4_RF/CMakeLists.txt | 4 ++++ .../TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt | 4 ++-- .../TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt | 4 ++-- .../drivers/802.15.4_RF/atmel-rf-driver/CMakeLists.txt | 4 ++-- .../802.15.4_RF/mcr20a-rf-driver/CMakeLists.txt | 4 ++-- .../802.15.4_RF/stm-s2lp-rf-driver/CMakeLists.txt | 4 ++-- connectivity/drivers/nfc/PN512/CMakeLists.txt | 4 ++-- connectivity/drivers/nfc/TARGET_M24SR/CMakeLists.txt | 4 ++-- connectivity/nfc/CMakeLists.txt | 10 ++++++---- connectivity/nfc/libraries/CMakeLists.txt | 2 +- connectivity/nfc/libraries/acore/CMakeLists.txt | 4 ++-- connectivity/nfc/libraries/stack/CMakeLists.txt | 4 ++-- connectivity/nfc/libraries/stack/tech/CMakeLists.txt | 4 ++-- .../nfc/libraries/stack/transceiver/CMakeLists.txt | 4 ++-- 15 files changed, 36 insertions(+), 32 deletions(-) diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt index ed6c4cbde9..bd9ec1197b 100644 --- a/connectivity/CMakeLists.txt +++ b/connectivity/CMakeLists.txt @@ -2,20 +2,18 @@ # SPDX-License-Identifier: Apache-2.0 # List of all connectivity libraries available. -add_library(mbed-802.15.4-rf INTERFACE) + add_library(mbed-ble INTERFACE) add_library(mbed-ble-cordio INTERFACE) add_library(mbed-ble-cordio_ll INTERFACE) -add_library(mbed-nfc INTERFACE) - add_subdirectory(nanostack) add_subdirectory(cellular) add_subdirectory(mbedtls) +add_subdirectory(nfc) add_subdirectory(drivers) add_subdirectory(FEATURE_BLE) add_subdirectory(libraries) add_subdirectory(lorawan) add_subdirectory(lwipstack) -add_subdirectory(netsocket) -add_subdirectory(nfc) \ No newline at end of file +add_subdirectory(netsocket) \ No newline at end of file diff --git a/connectivity/drivers/802.15.4_RF/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/CMakeLists.txt index 89dc412001..83dae10ac6 100644 --- a/connectivity/drivers/802.15.4_RF/CMakeLists.txt +++ b/connectivity/drivers/802.15.4_RF/CMakeLists.txt @@ -1,6 +1,10 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_library(mbed-802.15.4-rf STATIC EXCLUDE_FROM_ALL) + +target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-core-flags) + if("Freescale" IN_LIST MBED_TARGET_LABELS) add_subdirectory(TARGET_Freescale) add_subdirectory(mcr20a-rf-driver) diff --git a/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt index 5fd0224ed1..fb21cf2a1d 100644 --- a/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt +++ b/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-802.15.4-rf - INTERFACE + PUBLIC . ) target_sources(mbed-802.15.4-rf - INTERFACE + PRIVATE NanostackRfPhyKw41z.cpp ) diff --git a/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt index b96a51c948..93c3165cab 100644 --- a/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt +++ b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-802.15.4-rf - INTERFACE + PUBLIC . ) target_sources(mbed-802.15.4-rf - INTERFACE + PRIVATE NanostackRfPhyEfr32.cpp ) diff --git a/connectivity/drivers/802.15.4_RF/atmel-rf-driver/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/CMakeLists.txt index 8184174715..9bc65cfe37 100644 --- a/connectivity/drivers/802.15.4_RF/atmel-rf-driver/CMakeLists.txt +++ b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/CMakeLists.txt @@ -17,13 +17,13 @@ ################################################################################# target_include_directories(mbed-802.15.4-rf - INTERFACE + PUBLIC atmel-rf-driver source ) target_sources(mbed-802.15.4-rf - INTERFACE + PRIVATE source/NanostackRfPhyAT86RF215.cpp source/NanostackRfPhyAtmel.cpp source/at24mac.cpp diff --git a/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/CMakeLists.txt index 420ec7d13c..afb19f31da 100644 --- a/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/CMakeLists.txt +++ b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/CMakeLists.txt @@ -17,13 +17,13 @@ ################################################################################# target_include_directories(mbed-802.15.4-rf - INTERFACE + PUBLIC mcr20a-rf-driver source ) target_sources(mbed-802.15.4-rf - INTERFACE + PRIVATE source/MCR20Drv.c source/NanostackRfPhyMcr20a.cpp ) diff --git a/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/CMakeLists.txt index 02bd7856c4..859723507d 100644 --- a/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/CMakeLists.txt +++ b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/CMakeLists.txt @@ -17,13 +17,13 @@ ################################################################################# target_include_directories(mbed-802.15.4-rf - INTERFACE + PUBLIC stm-s2lp-rf-driver source ) target_sources(mbed-802.15.4-rf - INTERFACE + PRIVATE source/NanostackRfPhys2lp.cpp source/at24mac_s2lp.cpp source/rf_configuration.c diff --git a/connectivity/drivers/nfc/PN512/CMakeLists.txt b/connectivity/drivers/nfc/PN512/CMakeLists.txt index b6ba715369..730b490529 100644 --- a/connectivity/drivers/nfc/PN512/CMakeLists.txt +++ b/connectivity/drivers/nfc/PN512/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-nfc - INTERFACE + PUBLIC ./include ./include/nfc ./include/nfc/controllers @@ -11,7 +11,7 @@ target_include_directories(mbed-nfc ) target_sources(mbed-nfc - INTERFACE + PRIVATE source/PN512Driver.cpp source/PN512SPITransportDriver.cpp source/PN512TransportDriver.cpp diff --git a/connectivity/drivers/nfc/TARGET_M24SR/CMakeLists.txt b/connectivity/drivers/nfc/TARGET_M24SR/CMakeLists.txt index dc2a4d7c28..52cad19673 100644 --- a/connectivity/drivers/nfc/TARGET_M24SR/CMakeLists.txt +++ b/connectivity/drivers/nfc/TARGET_M24SR/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-nfc - INTERFACE + PUBLIC include include/nfc ) target_sources(mbed-nfc - INTERFACE + PRIVATE source/m24sr_driver.cpp ) diff --git a/connectivity/nfc/CMakeLists.txt b/connectivity/nfc/CMakeLists.txt index 79964e3f4b..aada036482 100644 --- a/connectivity/nfc/CMakeLists.txt +++ b/connectivity/nfc/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_library(mbed-nfc STATIC EXCLUDE_FROM_ALL) + add_subdirectory(libraries) if(MBED_OS_ENABLE_TESTS) @@ -10,7 +12,7 @@ if(MBED_OS_ENABLE_TESTS) endif() target_include_directories(mbed-nfc - INTERFACE + PUBLIC . ./include ./include/nfc @@ -19,7 +21,7 @@ target_include_directories(mbed-nfc ) target_sources(mbed-nfc - INTERFACE + PRIVATE source/NFCController.cpp source/NFCControllerDriver.cpp source/NFCEEPROM.cpp @@ -42,11 +44,11 @@ target_sources(mbed-nfc ) target_compile_definitions(mbed-nfc - INTERFACE + PUBLIC MBED_CONF_NFC_PRESENT=1 ) target_link_libraries(mbed-nfc - INTERFACE + PUBLIC mbed-events ) diff --git a/connectivity/nfc/libraries/CMakeLists.txt b/connectivity/nfc/libraries/CMakeLists.txt index 8f5c2ca92a..984435e392 100644 --- a/connectivity/nfc/libraries/CMakeLists.txt +++ b/connectivity/nfc/libraries/CMakeLists.txt @@ -5,6 +5,6 @@ add_subdirectory(acore) add_subdirectory(stack) target_include_directories(mbed-nfc - INTERFACE + PUBLIC . ) diff --git a/connectivity/nfc/libraries/acore/CMakeLists.txt b/connectivity/nfc/libraries/acore/CMakeLists.txt index 5eded30ca4..20ee418edc 100644 --- a/connectivity/nfc/libraries/acore/CMakeLists.txt +++ b/connectivity/nfc/libraries/acore/CMakeLists.txt @@ -2,13 +2,13 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-nfc - INTERFACE + PUBLIC . ./acore ) target_sources(mbed-nfc - INTERFACE + PRIVATE source/ac_buffer.c source/ac_buffer_builder.c source/ac_buffer_reader.c diff --git a/connectivity/nfc/libraries/stack/CMakeLists.txt b/connectivity/nfc/libraries/stack/CMakeLists.txt index 9ef281a647..f72646fdfa 100644 --- a/connectivity/nfc/libraries/stack/CMakeLists.txt +++ b/connectivity/nfc/libraries/stack/CMakeLists.txt @@ -5,14 +5,14 @@ add_subdirectory(tech) add_subdirectory(transceiver) target_include_directories(mbed-nfc - INTERFACE + PUBLIC . ./ndef ./platform ) target_sources(mbed-nfc - INTERFACE + PRIVATE ndef/ndef.c platform/nfc_scheduler.c diff --git a/connectivity/nfc/libraries/stack/tech/CMakeLists.txt b/connectivity/nfc/libraries/stack/tech/CMakeLists.txt index 827b7f3e69..dd747d899e 100644 --- a/connectivity/nfc/libraries/stack/tech/CMakeLists.txt +++ b/connectivity/nfc/libraries/stack/tech/CMakeLists.txt @@ -2,14 +2,14 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-nfc - INTERFACE + PUBLIC ./iso7816 ./isodep ./type4 ) target_sources(mbed-nfc - INTERFACE + PRIVATE iso7816/iso7816.c iso7816/iso7816_app.c diff --git a/connectivity/nfc/libraries/stack/transceiver/CMakeLists.txt b/connectivity/nfc/libraries/stack/transceiver/CMakeLists.txt index 7758e2655e..458ff816ed 100644 --- a/connectivity/nfc/libraries/stack/transceiver/CMakeLists.txt +++ b/connectivity/nfc/libraries/stack/transceiver/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-nfc - INTERFACE + PUBLIC . ) target_sources(mbed-nfc - INTERFACE + PRIVATE transceiver.c )