From 3cf77c2ca1c7b903f16643aee18dd87597635217 Mon Sep 17 00:00:00 2001 From: Jamie Smith Date: Mon, 30 May 2022 18:35:22 -0700 Subject: [PATCH] Convert emac, cellular, and wifi targets, and enable one UDP test --- connectivity/CMakeLists.txt | 3 --- connectivity/cellular/CMakeLists.txt | 5 ++-- .../Altair/ALT1250/PPP/CMakeLists.txt | 4 +-- connectivity/drivers/cellular/CMakeLists.txt | 2 +- .../COMPONENT_STMOD_CELLULAR/CMakeLists.txt | 4 +-- .../cellular/GEMALTO/CINTERION/CMakeLists.txt | 4 +-- .../GENERIC/GENERIC_AT3GPP/CMakeLists.txt | 4 +-- .../DragonflyNano/PPP/CMakeLists.txt | 4 +-- .../cellular/QUECTEL/BC95/CMakeLists.txt | 4 +-- .../cellular/QUECTEL/BG96/CMakeLists.txt | 4 +-- .../cellular/QUECTEL/EC2X/CMakeLists.txt | 4 +-- .../cellular/QUECTEL/M26/CMakeLists.txt | 4 +-- .../cellular/QUECTEL/UG96/CMakeLists.txt | 4 +-- .../cellular/RiotMicro/AT/CMakeLists.txt | 4 +-- .../cellular/TELIT/HE910/CMakeLists.txt | 4 +-- .../cellular/TELIT/ME310/CMakeLists.txt | 4 +-- .../cellular/TELIT/ME910/CMakeLists.txt | 4 +-- .../drivers/cellular/UBLOX/AT/CMakeLists.txt | 4 +-- .../cellular/UBLOX/N2XX/CMakeLists.txt | 4 +-- .../drivers/cellular/UBLOX/PPP/CMakeLists.txt | 4 +-- connectivity/drivers/emac/CMakeLists.txt | 12 +++++++-- .../COMPONENT_LAN91C111/CMakeLists.txt | 4 +-- .../COMPONENT_SMSC9220/CMakeLists.txt | 4 +-- .../COMPONENT_SCL/CMakeLists.txt | 4 +-- .../emac/TARGET_Freescale_EMAC/CMakeLists.txt | 4 +-- .../TARGET_K64F/CMakeLists.txt | 2 +- .../TARGET_K66F/CMakeLists.txt | 2 +- .../emac/TARGET_GD_EMAC/CMakeLists.txt | 4 +-- .../TARGET_GD32F30X/CMakeLists.txt | 2 +- .../TARGET_GD32F4XX/CMakeLists.txt | 2 +- .../emac/TARGET_NUVOTON_EMAC/CMakeLists.txt | 4 +-- .../TARGET_M480/CMakeLists.txt | 4 +-- .../TARGET_NUC472/CMakeLists.txt | 4 +-- .../TARGET_NXP_EMAC/TARGET_IMX/CMakeLists.txt | 4 +-- .../TARGET_LPCTarget/CMakeLists.txt | 4 +-- .../TARGET_MCU_LPC546XX/CMakeLists.txt | 4 +-- .../TARGET_FF_LPC546XX/CMakeLists.txt | 2 +- .../TARGET_LPCXpresso/CMakeLists.txt | 2 +- .../emac/TARGET_RDA_EMAC/CMakeLists.txt | 4 +-- .../TARGET_RZ_A1XX/CMakeLists.txt | 4 +-- .../TARGET_RZ_A2XX/CMakeLists.txt | 4 +-- .../drivers/emac/TARGET_STM/CMakeLists.txt | 4 +-- .../TARGET_STM/TARGET_STM32F2/CMakeLists.txt | 4 +-- .../TARGET_NUCLEO_F207ZG/CMakeLists.txt | 2 +- .../TARGET_STM/TARGET_STM32F4/CMakeLists.txt | 2 +- .../TARGET_ARCH_MAX/CMakeLists.txt | 4 +-- .../TARGET_NUCLEO_F429ZI/CMakeLists.txt | 4 +-- .../TARGET_NUCLEO_F439ZI/CMakeLists.txt | 4 +-- .../TARGET_STM/TARGET_STM32F7/CMakeLists.txt | 4 +-- .../TARGET_DISCO_F746NG/CMakeLists.txt | 2 +- .../TARGET_DISCO_F769NI/CMakeLists.txt | 2 +- .../TARGET_NUCLEO_F746ZG/CMakeLists.txt | 2 +- .../TARGET_NUCLEO_F756ZG/CMakeLists.txt | 2 +- .../TARGET_NUCLEO_F767ZI/CMakeLists.txt | 2 +- .../TARGET_STM/TARGET_STM32H7/CMakeLists.txt | 4 +-- .../TARGET_DISCO_H747I/CMakeLists.txt | 2 +- .../TARGET_NUCLEO_H743ZI/CMakeLists.txt | 2 +- .../TARGET_NUCLEO_H743ZI2/CMakeLists.txt | 2 +- .../TARGET_PORTENTA_H7/CMakeLists.txt | 2 +- .../emac/TARGET_Silicon_Labs/CMakeLists.txt | 4 +-- connectivity/drivers/wifi/CMakeLists.txt | 4 ++- .../drivers/wifi/COMPONENT_WHD/CMakeLists.txt | 26 +++++++++--------- .../whd-bsp-integration/CMakeLists.txt | 10 +++---- .../COMPONENT_EMW3080B/CMakeLists.txt | 6 ++--- .../drivers/wifi/TARGET_WICED/CMakeLists.txt | 8 +++--- .../wifi/esp8266-driver/CMakeLists.txt | 4 +-- connectivity/libraries/ppp/CMakeLists.txt | 16 ++++++++--- connectivity/lwipstack/CMakeLists.txt | 2 +- connectivity/mbedtls/CMakeLists.txt | 2 ++ connectivity/nanostack/CMakeLists.txt | 2 +- .../nanostack/mbed-mesh-api/CMakeLists.txt | 2 +- .../CMakeLists.txt | 6 ++++- .../source/Service_Libs/CMakeLists.txt | 2 +- .../Service_Libs/mle_service/mle_service.c | 2 +- ...nter_table.c => mle_service_frame_count.c} | 2 +- ...nter_table.h => mle_service_frame_count.h} | 6 ++--- connectivity/netsocket/CMakeLists.txt | 27 ++++++++++++------- .../netsocket/tests/TESTS/CMakeLists.txt | 6 +++++ .../tests/TESTS/netsocket/CMakeLists.txt | 1 + .../tests/TESTS/netsocket/udp/CMakeLists.txt | 14 ++-------- .../udp/udpsocket_echotest_burst.cpp | 2 +- .../netsocket/udp/udpsocket_recv_timeout.cpp | 6 ++--- .../netsocket/udp/udpsocket_sendto_repeat.cpp | 2 +- platform/randlib/CMakeLists.txt | 7 +++++ .../randlib/source}/arm_hal_random.c | 0 85 files changed, 205 insertions(+), 172 deletions(-) rename connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/{mle_service_frame_counter_table.c => mle_service_frame_count.c} (98%) rename connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/{mle_service_frame_counter_table.h => mle_service_frame_count.h} (89%) create mode 100644 connectivity/netsocket/tests/TESTS/CMakeLists.txt create mode 100644 connectivity/netsocket/tests/TESTS/netsocket/CMakeLists.txt rename {connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos => platform/randlib/source}/arm_hal_random.c (100%) diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt index 3f84e2e953..b8673be172 100644 --- a/connectivity/CMakeLists.txt +++ b/connectivity/CMakeLists.txt @@ -6,13 +6,10 @@ 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-emac INTERFACE) add_library(mbed-lorawan INTERFACE) add_library(mbed-mbedtls STATIC EXCLUDE_FROM_ALL) add_library(mbed-nfc INTERFACE) -add_library(mbed-ppp INTERFACE) -add_library(mbed-wifi INTERFACE) add_subdirectory(nanostack) add_subdirectory(cellular) diff --git a/connectivity/cellular/CMakeLists.txt b/connectivity/cellular/CMakeLists.txt index 4198fecb05..037efc9b3c 100644 --- a/connectivity/cellular/CMakeLists.txt +++ b/connectivity/cellular/CMakeLists.txt @@ -31,12 +31,13 @@ target_compile_definitions(mbed-cellular ) target_sources(mbed-cellular - PUBLIC + PRIVATE source/CellularNonIPSocket.cpp ) target_link_libraries(mbed-cellular PUBLIC - mbed-netsocket + mbed-netsocket-api mbed-core-flags + mbed-randlib ) diff --git a/connectivity/drivers/cellular/Altair/ALT1250/PPP/CMakeLists.txt b/connectivity/drivers/cellular/Altair/ALT1250/PPP/CMakeLists.txt index 682b480b16..64dff13fe7 100644 --- a/connectivity/drivers/cellular/Altair/ALT1250/PPP/CMakeLists.txt +++ b/connectivity/drivers/cellular/Altair/ALT1250/PPP/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE ALT1250_PPP.cpp ALT1250_PPP_CellularContext.cpp ALT1250_PPP_CellularNetwork.cpp diff --git a/connectivity/drivers/cellular/CMakeLists.txt b/connectivity/drivers/cellular/CMakeLists.txt index c32350b0b1..9a0346fbe8 100644 --- a/connectivity/drivers/cellular/CMakeLists.txt +++ b/connectivity/drivers/cellular/CMakeLists.txt @@ -15,6 +15,6 @@ add_subdirectory(TELIT) add_subdirectory(UBLOX) target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/CMakeLists.txt b/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/CMakeLists.txt index fb984bf2a2..aa221bba34 100644 --- a/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/CMakeLists.txt +++ b/connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE STModCellular.cpp ) diff --git a/connectivity/drivers/cellular/GEMALTO/CINTERION/CMakeLists.txt b/connectivity/drivers/cellular/GEMALTO/CINTERION/CMakeLists.txt index 82654ee2b2..96e563b4a8 100644 --- a/connectivity/drivers/cellular/GEMALTO/CINTERION/CMakeLists.txt +++ b/connectivity/drivers/cellular/GEMALTO/CINTERION/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE GEMALTO_CINTERION.cpp GEMALTO_CINTERION_CellularContext.cpp GEMALTO_CINTERION_CellularInformation.cpp diff --git a/connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP/CMakeLists.txt b/connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP/CMakeLists.txt index 6d4e280652..9f23a73608 100644 --- a/connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP/CMakeLists.txt +++ b/connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE GENERIC_AT3GPP.cpp ) diff --git a/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt b/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt index 73d860f2cb..293be2378d 100644 --- a/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt +++ b/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE SARA4_PPP.cpp SARA4_PPP_CellularNetwork.cpp ) diff --git a/connectivity/drivers/cellular/QUECTEL/BC95/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/BC95/CMakeLists.txt index 2b90249f73..d4b43f26a6 100644 --- a/connectivity/drivers/cellular/QUECTEL/BC95/CMakeLists.txt +++ b/connectivity/drivers/cellular/QUECTEL/BC95/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE QUECTEL_BC95.cpp QUECTEL_BC95_CellularContext.cpp QUECTEL_BC95_CellularInformation.cpp diff --git a/connectivity/drivers/cellular/QUECTEL/BG96/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/BG96/CMakeLists.txt index d0d0bfe7d3..d73ac1b271 100644 --- a/connectivity/drivers/cellular/QUECTEL/BG96/CMakeLists.txt +++ b/connectivity/drivers/cellular/QUECTEL/BG96/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE QUECTEL_BG96.cpp QUECTEL_BG96_CellularContext.cpp QUECTEL_BG96_CellularInformation.cpp diff --git a/connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt index 95430ab62c..4c92c6a690 100644 --- a/connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt +++ b/connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE QUECTEL_EC2X.cpp ) diff --git a/connectivity/drivers/cellular/QUECTEL/M26/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/M26/CMakeLists.txt index b78985a190..7557466958 100644 --- a/connectivity/drivers/cellular/QUECTEL/M26/CMakeLists.txt +++ b/connectivity/drivers/cellular/QUECTEL/M26/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE QUECTEL_M26.cpp QUECTEL_M26_CellularContext.cpp QUECTEL_M26_CellularInformation.cpp diff --git a/connectivity/drivers/cellular/QUECTEL/UG96/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/UG96/CMakeLists.txt index 0878e891fc..5351df856d 100644 --- a/connectivity/drivers/cellular/QUECTEL/UG96/CMakeLists.txt +++ b/connectivity/drivers/cellular/QUECTEL/UG96/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE QUECTEL_UG96.cpp QUECTEL_UG96_CellularContext.cpp ) diff --git a/connectivity/drivers/cellular/RiotMicro/AT/CMakeLists.txt b/connectivity/drivers/cellular/RiotMicro/AT/CMakeLists.txt index 91fe504563..38e16566a4 100644 --- a/connectivity/drivers/cellular/RiotMicro/AT/CMakeLists.txt +++ b/connectivity/drivers/cellular/RiotMicro/AT/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE RM1000_AT.cpp RM1000_AT_CellularContext.cpp RM1000_AT_CellularNetwork.cpp diff --git a/connectivity/drivers/cellular/TELIT/HE910/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/HE910/CMakeLists.txt index c510018320..2f6c4b77a5 100644 --- a/connectivity/drivers/cellular/TELIT/HE910/CMakeLists.txt +++ b/connectivity/drivers/cellular/TELIT/HE910/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE TELIT_HE910.cpp ) diff --git a/connectivity/drivers/cellular/TELIT/ME310/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/ME310/CMakeLists.txt index e683fb69df..095086d442 100644 --- a/connectivity/drivers/cellular/TELIT/ME310/CMakeLists.txt +++ b/connectivity/drivers/cellular/TELIT/ME310/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE TELIT_ME310.cpp TELIT_ME310_CellularContext.cpp TELIT_ME310_CellularNetwork.cpp diff --git a/connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt index a0e9506e22..437be9f7b3 100644 --- a/connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt +++ b/connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE TELIT_ME910.cpp TELIT_ME910_CellularContext.cpp TELIT_ME910_CellularNetwork.cpp diff --git a/connectivity/drivers/cellular/UBLOX/AT/CMakeLists.txt b/connectivity/drivers/cellular/UBLOX/AT/CMakeLists.txt index c97e1ea8ac..44077b734d 100644 --- a/connectivity/drivers/cellular/UBLOX/AT/CMakeLists.txt +++ b/connectivity/drivers/cellular/UBLOX/AT/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE UBLOX_AT.cpp UBLOX_AT_CellularContext.cpp UBLOX_AT_CellularNetwork.cpp diff --git a/connectivity/drivers/cellular/UBLOX/N2XX/CMakeLists.txt b/connectivity/drivers/cellular/UBLOX/N2XX/CMakeLists.txt index 97340c0272..e5957671c4 100644 --- a/connectivity/drivers/cellular/UBLOX/N2XX/CMakeLists.txt +++ b/connectivity/drivers/cellular/UBLOX/N2XX/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE UBLOX_N2XX.cpp UBLOX_N2XX_CellularContext.cpp UBLOX_N2XX_CellularNetwork.cpp diff --git a/connectivity/drivers/cellular/UBLOX/PPP/CMakeLists.txt b/connectivity/drivers/cellular/UBLOX/PPP/CMakeLists.txt index 42afbf9d40..52182dbf2f 100644 --- a/connectivity/drivers/cellular/UBLOX/PPP/CMakeLists.txt +++ b/connectivity/drivers/cellular/UBLOX/PPP/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-cellular - INTERFACE + PUBLIC . ) target_sources(mbed-cellular - INTERFACE + PRIVATE UBLOX_PPP.cpp ) diff --git a/connectivity/drivers/emac/CMakeLists.txt b/connectivity/drivers/emac/CMakeLists.txt index 56e7f474ea..95c91f6b6c 100644 --- a/connectivity/drivers/emac/CMakeLists.txt +++ b/connectivity/drivers/emac/CMakeLists.txt @@ -1,6 +1,12 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +if(NOT "DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS) + return() +endif() + +add_library(mbed-emac STATIC EXCLUDE_FROM_ALL) + if("ARM_FM" IN_LIST MBED_TARGET_LABELS) add_subdirectory(TARGET_ARM_FM) elseif("ARM_SSG" IN_LIST MBED_TARGET_LABELS) @@ -30,6 +36,8 @@ if("WHD" IN_LIST MBED_TARGET_LABELS) endif() target_link_libraries(mbed-emac - INTERFACE - mbed-netsocket + PUBLIC + mbed-netsocket-api + PRIVATE + mbed-rtos-flags ) diff --git a/connectivity/drivers/emac/TARGET_ARM_FM/COMPONENT_LAN91C111/CMakeLists.txt b/connectivity/drivers/emac/TARGET_ARM_FM/COMPONENT_LAN91C111/CMakeLists.txt index 73b0de8153..16131c42c9 100644 --- a/connectivity/drivers/emac/TARGET_ARM_FM/COMPONENT_LAN91C111/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_ARM_FM/COMPONENT_LAN91C111/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE fvp_emac.cpp ) diff --git a/connectivity/drivers/emac/TARGET_ARM_SSG/COMPONENT_SMSC9220/CMakeLists.txt b/connectivity/drivers/emac/TARGET_ARM_SSG/COMPONENT_SMSC9220/CMakeLists.txt index 4a944235dc..a0f92c1e45 100644 --- a/connectivity/drivers/emac/TARGET_ARM_SSG/COMPONENT_SMSC9220/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_ARM_SSG/COMPONENT_SMSC9220/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE smsc9220_emac.cpp ) diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_SCL/CMakeLists.txt b/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_SCL/CMakeLists.txt index 907800b492..ea511ed574 100644 --- a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_SCL/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_SCL/CMakeLists.txt @@ -2,13 +2,13 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ./interface ) target_sources(mbed-emac - INTERFACE + PRIVATE interface/default_wifi_interface.cpp interface/scl_emac.cpp interface/SclAccessPoint.cpp diff --git a/connectivity/drivers/emac/TARGET_Freescale_EMAC/CMakeLists.txt b/connectivity/drivers/emac/TARGET_Freescale_EMAC/CMakeLists.txt index 1aff70d6a0..a8a15946fb 100644 --- a/connectivity/drivers/emac/TARGET_Freescale_EMAC/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_Freescale_EMAC/CMakeLists.txt @@ -8,11 +8,11 @@ elseif("K66F" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE kinetis_emac.cpp ) diff --git a/connectivity/drivers/emac/TARGET_Freescale_EMAC/TARGET_K64F/CMakeLists.txt b/connectivity/drivers/emac/TARGET_Freescale_EMAC/TARGET_K64F/CMakeLists.txt index 5593767f2b..740b86f29d 100644 --- a/connectivity/drivers/emac/TARGET_Freescale_EMAC/TARGET_K64F/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_Freescale_EMAC/TARGET_K64F/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE hardware_init_MK64F12.c ) diff --git a/connectivity/drivers/emac/TARGET_Freescale_EMAC/TARGET_K66F/CMakeLists.txt b/connectivity/drivers/emac/TARGET_Freescale_EMAC/TARGET_K66F/CMakeLists.txt index 5d713be471..e7e1ee83d9 100644 --- a/connectivity/drivers/emac/TARGET_Freescale_EMAC/TARGET_K66F/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_Freescale_EMAC/TARGET_K66F/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE hardware_init_MK66F18.c ) diff --git a/connectivity/drivers/emac/TARGET_GD_EMAC/CMakeLists.txt b/connectivity/drivers/emac/TARGET_GD_EMAC/CMakeLists.txt index c6f25f9fad..de19e25d90 100644 --- a/connectivity/drivers/emac/TARGET_GD_EMAC/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_GD_EMAC/CMakeLists.txt @@ -8,11 +8,11 @@ elseif("GD32F4XX" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE gd32xx_emac.cpp ) diff --git a/connectivity/drivers/emac/TARGET_GD_EMAC/TARGET_GD32F30X/CMakeLists.txt b/connectivity/drivers/emac/TARGET_GD_EMAC/TARGET_GD32F30X/CMakeLists.txt index 516c6da897..1e26b472e5 100644 --- a/connectivity/drivers/emac/TARGET_GD_EMAC/TARGET_GD32F30X/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_GD_EMAC/TARGET_GD32F30X/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE gd32f3_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_GD_EMAC/TARGET_GD32F4XX/CMakeLists.txt b/connectivity/drivers/emac/TARGET_GD_EMAC/TARGET_GD32F4XX/CMakeLists.txt index 4879b64101..7405e842e8 100644 --- a/connectivity/drivers/emac/TARGET_GD_EMAC/TARGET_GD32F4XX/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_GD_EMAC/TARGET_GD32F4XX/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE gd32f4_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/CMakeLists.txt b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/CMakeLists.txt index 43dab9de3f..798e419397 100644 --- a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/CMakeLists.txt @@ -8,11 +8,11 @@ elseif("NUC472" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE numaker_emac.cpp ) diff --git a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M480/CMakeLists.txt b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M480/CMakeLists.txt index d87d21cf8e..cce4f2b40a 100644 --- a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M480/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_M480/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE m480_eth.c ) diff --git a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_NUC472/CMakeLists.txt b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_NUC472/CMakeLists.txt index f42680b29a..153b5b42fa 100644 --- a/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_NUC472/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_NUVOTON_EMAC/TARGET_NUC472/CMakeLists.txt @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE nuc472_eth.c ) diff --git a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_IMX/CMakeLists.txt b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_IMX/CMakeLists.txt index 62dc137712..f9c711d23b 100644 --- a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_IMX/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_IMX/CMakeLists.txt @@ -6,11 +6,11 @@ if("MIMXRT1050_EVK" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE imx_emac.cpp ) diff --git a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_LPCTarget/CMakeLists.txt b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_LPCTarget/CMakeLists.txt index b93dc93b8a..edc12148a0 100644 --- a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_LPCTarget/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_LPCTarget/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE lpc17_emac.cpp lpc_phy_dp83848.cpp ) diff --git a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/CMakeLists.txt b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/CMakeLists.txt index 6a5007501b..d58001d00b 100644 --- a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/CMakeLists.txt @@ -8,11 +8,11 @@ elseif("LPCXpresso" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE lpc546xx_emac.cpp ) diff --git a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/TARGET_FF_LPC546XX/CMakeLists.txt b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/TARGET_FF_LPC546XX/CMakeLists.txt index a6faa3ff12..ea0e81ab7e 100644 --- a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/TARGET_FF_LPC546XX/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/TARGET_FF_LPC546XX/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE hardware_init_LPC546XX.c ) diff --git a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/TARGET_LPCXpresso/CMakeLists.txt b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/TARGET_LPCXpresso/CMakeLists.txt index a6faa3ff12..ea0e81ab7e 100644 --- a/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/TARGET_LPCXpresso/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/TARGET_LPCXpresso/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE hardware_init_LPC546XX.c ) diff --git a/connectivity/drivers/emac/TARGET_RDA_EMAC/CMakeLists.txt b/connectivity/drivers/emac/TARGET_RDA_EMAC/CMakeLists.txt index 4be0de7e51..ff2c4a5e32 100644 --- a/connectivity/drivers/emac/TARGET_RDA_EMAC/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_RDA_EMAC/CMakeLists.txt @@ -4,12 +4,12 @@ add_subdirectory(lwip-wifi) target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE RdaWiFiInterface.cpp rda5981x_emac.cpp ) diff --git a/connectivity/drivers/emac/TARGET_RENESAS_EMAC/TARGET_RZ_A1XX/CMakeLists.txt b/connectivity/drivers/emac/TARGET_RENESAS_EMAC/TARGET_RZ_A1XX/CMakeLists.txt index 1dc5f4b69d..f869cd2150 100644 --- a/connectivity/drivers/emac/TARGET_RENESAS_EMAC/TARGET_RZ_A1XX/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_RENESAS_EMAC/TARGET_RZ_A1XX/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE rza1_emac.cpp rza1_eth.cpp ) diff --git a/connectivity/drivers/emac/TARGET_RENESAS_EMAC/TARGET_RZ_A2XX/CMakeLists.txt b/connectivity/drivers/emac/TARGET_RENESAS_EMAC/TARGET_RZ_A2XX/CMakeLists.txt index 73c1b952d6..66f587817e 100644 --- a/connectivity/drivers/emac/TARGET_RENESAS_EMAC/TARGET_RZ_A2XX/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_RENESAS_EMAC/TARGET_RZ_A2XX/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . r_ether_rza2 r_ether_rza2/src/phy @@ -11,7 +11,7 @@ target_include_directories(mbed-emac ) target_sources(mbed-emac - INTERFACE + PRIVATE rza2_emac.cpp r_ether_rza2/src/r_ether_rza2.c r_ether_rza2/src/phy/phy.c diff --git a/connectivity/drivers/emac/TARGET_STM/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/CMakeLists.txt index 354c246f01..6391816499 100644 --- a/connectivity/drivers/emac/TARGET_STM/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/CMakeLists.txt @@ -12,12 +12,12 @@ elseif("STM32H7" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE stm32xx_emac.cpp stm32xx_eth_irq_callback.cpp ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/CMakeLists.txt index e5d922c4db..9a33dc7453 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/CMakeLists.txt @@ -6,11 +6,11 @@ if("NUCLEO_F207ZG" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE stm32f2_eth_conf.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/TARGET_NUCLEO_F207ZG/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/TARGET_NUCLEO_F207ZG/CMakeLists.txt index 81691bff8c..951b5ee9de 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/TARGET_NUCLEO_F207ZG/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/TARGET_NUCLEO_F207ZG/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE stm32f2_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/CMakeLists.txt index 011678e4fa..d952229bba 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/CMakeLists.txt @@ -10,6 +10,6 @@ elseif("NUCLEO_F439ZI" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_ARCH_MAX/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_ARCH_MAX/CMakeLists.txt index 91c025febe..07d2f1d1b2 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_ARCH_MAX/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_ARCH_MAX/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE stm32f4_eth_conf.c stm32f4_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/CMakeLists.txt index 91c025febe..07d2f1d1b2 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE stm32f4_eth_conf.c stm32f4_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/CMakeLists.txt index 91c025febe..07d2f1d1b2 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE stm32f4_eth_conf.c stm32f4_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/CMakeLists.txt index 0c6b882c7a..46dc00c7ff 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/CMakeLists.txt @@ -14,11 +14,11 @@ elseif("NUCLEO_F767ZI" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE stm32f7_eth_conf.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F746NG/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F746NG/CMakeLists.txt index 752528bd4f..7d61704f6c 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F746NG/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F746NG/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PUBLIC stm32f7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F769NI/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F769NI/CMakeLists.txt index 752528bd4f..7d61704f6c 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F769NI/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F769NI/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PUBLIC stm32f7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F746ZG/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F746ZG/CMakeLists.txt index 752528bd4f..7d61704f6c 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F746ZG/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F746ZG/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PUBLIC stm32f7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F756ZG/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F756ZG/CMakeLists.txt index 752528bd4f..7d61704f6c 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F756ZG/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F756ZG/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PUBLIC stm32f7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F767ZI/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F767ZI/CMakeLists.txt index 752528bd4f..7d61704f6c 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F767ZI/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F767ZI/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PUBLIC stm32f7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/CMakeLists.txt index 5c9e756148..fc8668cae7 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/CMakeLists.txt @@ -12,12 +12,12 @@ elseif("NUCLEO_H743ZI2" IN_LIST MBED_TARGET_LABELS) endif() target_include_directories(mbed-emac - INTERFACE + PUBLIC . ./lan8742 ) target_sources(mbed-emac - INTERFACE + PRIVATE lan8742/lan8742.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_DISCO_H747I/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_DISCO_H747I/CMakeLists.txt index 5e6c9d6be7..09efa30253 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_DISCO_H747I/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_DISCO_H747I/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE stm32h7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI/CMakeLists.txt index 5e6c9d6be7..09efa30253 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PRIVATE stm32h7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI2/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI2/CMakeLists.txt index 5e6c9d6be7..635a02bd7a 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI2/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI2/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PUBLIC stm32h7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_PORTENTA_H7/CMakeLists.txt b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_PORTENTA_H7/CMakeLists.txt index 5e6c9d6be7..635a02bd7a 100644 --- a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_PORTENTA_H7/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_PORTENTA_H7/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-emac - INTERFACE + PUBLIC stm32h7_eth_init.c ) diff --git a/connectivity/drivers/emac/TARGET_Silicon_Labs/CMakeLists.txt b/connectivity/drivers/emac/TARGET_Silicon_Labs/CMakeLists.txt index 2e4cc56583..531a7013d2 100644 --- a/connectivity/drivers/emac/TARGET_Silicon_Labs/CMakeLists.txt +++ b/connectivity/drivers/emac/TARGET_Silicon_Labs/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-emac - INTERFACE + PUBLIC . ) target_sources(mbed-emac - INTERFACE + PRIVATE sl_emac.cpp sl_eth_hw.c ) diff --git a/connectivity/drivers/wifi/CMakeLists.txt b/connectivity/drivers/wifi/CMakeLists.txt index 78ecb7fa4c..6d85c6de9e 100644 --- a/connectivity/drivers/wifi/CMakeLists.txt +++ b/connectivity/drivers/wifi/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_library(mbed-wifi STATIC EXCLUDE_FROM_ALL) + add_subdirectory(TARGET_WICED EXCLUDE_FROM_ALL) add_subdirectory(TARGET_STM EXCLUDE_FROM_ALL) @@ -13,5 +15,5 @@ add_subdirectory(esp8266-driver) target_link_libraries(mbed-wifi INTERFACE - mbed-netsocket + mbed-netsocket-api ) diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt index 64190c0a05..d394ceb4aa 100644 --- a/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt +++ b/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt @@ -3,39 +3,39 @@ add_subdirectory(whd-bsp-integration EXCLUDE_FROM_ALL) -add_library(mbed-cy-psoc6-whd-43012 INTERFACE) +add_library(mbed-cy-psoc6-whd-43012 STATIC EXCLUDE_FROM_ALL) target_include_directories(mbed-cy-psoc6-whd-43012 - INTERFACE + PUBLIC wifi-host-driver/resources/firmware/COMPONENT_43012 ) target_sources(mbed-cy-psoc6-whd-43012 - INTERFACE + PRIVATE wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0_bin.c wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c ) -add_library(mbed-cy-psoc6-whd-43438 INTERFACE) +add_library(mbed-cy-psoc6-whd-43438 STATIC EXCLUDE_FROM_ALL) target_include_directories(mbed-cy-psoc6-whd-43438 - INTERFACE + PUBLIC wifi-host-driver/resources/firmware/COMPONENT_43438 ) target_sources(mbed-cy-psoc6-whd-43438 - INTERFACE + PRIVATE wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1_bin.c wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1_clm_blob.c ) -add_library(mbed-cy-psoc6-whd-4343w INTERFACE) +add_library(mbed-cy-psoc6-whd-4343w STATIC EXCLUDE_FROM_ALL) target_include_directories(mbed-cy-psoc6-whd-4343w - INTERFACE + PUBLIC wifi-host-driver/resources/firmware/COMPONENT_4343W ) target_sources(mbed-cy-psoc6-whd-4343w - INTERFACE + PRIVATE wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1_bin.c @@ -97,10 +97,10 @@ add_library(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE) target_include_directories(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064B0S2_4343W) -add_library(mbed-cy-psoc6-whd INTERFACE) +add_library(mbed-cy-psoc6-whd STATIC EXCLUDE_FROM_ALL) target_include_directories(mbed-cy-psoc6-whd - INTERFACE + PUBLIC wifi-host-driver wifi-host-driver/inc wifi-host-driver/resources/resource_imp @@ -110,7 +110,7 @@ target_include_directories(mbed-cy-psoc6-whd ) target_sources(mbed-cy-psoc6-whd - INTERFACE + PRIVATE wifi-host-driver/resources/resource_imp/whd_resources.c wifi-host-driver/src/whd_ap.c @@ -139,6 +139,6 @@ target_sources(mbed-cy-psoc6-whd ) target_compile_definitions(mbed-cy-psoc6-whd - INTERFACE + PUBLIC MBED_CONF_CY_PSOC6_WHD_PRESENT=1 ) diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/whd-bsp-integration/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/whd-bsp-integration/CMakeLists.txt index 2c5b5f4c89..cf709f7f7a 100644 --- a/connectivity/drivers/wifi/COMPONENT_WHD/whd-bsp-integration/CMakeLists.txt +++ b/connectivity/drivers/wifi/COMPONENT_WHD/whd-bsp-integration/CMakeLists.txt @@ -1,26 +1,26 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(mbed-cy-psoc6-common-network INTERFACE) +add_library(mbed-cy-psoc6-common-network STATIC EXCLUDE_FROM_ALL) target_include_directories(mbed-cy-psoc6-common-network - INTERFACE + PUBLIC . ) target_sources(mbed-cy-psoc6-common-network - INTERFACE + PRIVATE cy_network_buffer.c cybsp_wifi.c ) target_link_libraries(mbed-cy-psoc6-common-network - INTERFACE + PUBLIC mbed-lwipstack mbed-emac ) target_compile_definitions(mbed-cy-psoc6-common-network - INTERFACE + PUBLIC MBED_CONF_cy-psoc6-common-network_PRESENT=1 ) diff --git a/connectivity/drivers/wifi/TARGET_STM/COMPONENT_EMW3080B/CMakeLists.txt b/connectivity/drivers/wifi/TARGET_STM/COMPONENT_EMW3080B/CMakeLists.txt index 830fdf088d..a91dc52b11 100644 --- a/connectivity/drivers/wifi/TARGET_STM/COMPONENT_EMW3080B/CMakeLists.txt +++ b/connectivity/drivers/wifi/TARGET_STM/COMPONENT_EMW3080B/CMakeLists.txt @@ -1,17 +1,15 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(wifi-EMW3080B INTERFACE) - target_include_directories(mbed-wifi - INTERFACE + PUBLIC . mx_wifi mx_wifi/core ) target_sources(mbed-wifi - INTERFACE + PRIVATE EMW3080BInterface.cpp EMW3080B_EMAC.cpp EMW3080B_UART.cpp diff --git a/connectivity/drivers/wifi/TARGET_WICED/CMakeLists.txt b/connectivity/drivers/wifi/TARGET_WICED/CMakeLists.txt index 8bcf3677e3..f2b2fec599 100644 --- a/connectivity/drivers/wifi/TARGET_WICED/CMakeLists.txt +++ b/connectivity/drivers/wifi/TARGET_WICED/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(mbed-wiced INTERFACE) +add_library(mbed-wiced STATIC EXCLUDE_FROM_ALL) if(${CMAKE_CROSSCOMPILING}) if(${MBED_TOOLCHAIN} STREQUAL "ARM") @@ -10,15 +10,15 @@ if(${CMAKE_CROSSCOMPILING}) set(LIB_WICED_DRIVERS TOOLCHAIN_GCC_ARM/TARGET_WIO_EMW3166/libwiced_drivers.a) endif() -target_link_libraries(mbed-wiced INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_WICED_DRIVERS}) + target_link_libraries(mbed-wiced INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_WICED_DRIVERS}) endif() target_include_directories(mbed-wiced - INTERFACE + PUBLIC wiced_interface ) target_sources(mbed-wiced - INTERFACE + PRIVATE wiced_interface/default_wifi_interface.cpp ) diff --git a/connectivity/drivers/wifi/esp8266-driver/CMakeLists.txt b/connectivity/drivers/wifi/esp8266-driver/CMakeLists.txt index b49ced00a4..682139f0e8 100644 --- a/connectivity/drivers/wifi/esp8266-driver/CMakeLists.txt +++ b/connectivity/drivers/wifi/esp8266-driver/CMakeLists.txt @@ -2,13 +2,13 @@ # SPDX-License-Identifier: Apache-2.0 target_sources(mbed-wifi - INTERFACE + PRIVATE ESP8266Interface.cpp ESP8266/ESP8266.cpp ) target_include_directories(mbed-wifi - INTERFACE + PUBLIC . ./ESP8266 ) diff --git a/connectivity/libraries/ppp/CMakeLists.txt b/connectivity/libraries/ppp/CMakeLists.txt index 424b5793db..d2a2b75fa3 100644 --- a/connectivity/libraries/ppp/CMakeLists.txt +++ b/connectivity/libraries/ppp/CMakeLists.txt @@ -1,8 +1,10 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_library(mbed-ppp STATIC EXCLUDE_FROM_ALL) + target_include_directories(mbed-ppp - INTERFACE + PUBLIC . ./include ./include/polarssl @@ -10,7 +12,7 @@ target_include_directories(mbed-ppp ) target_sources(mbed-ppp - INTERFACE + PRIVATE source/auth.c source/ccp.c source/chap-md5.c @@ -47,6 +49,14 @@ target_sources(mbed-ppp ) target_compile_definitions(mbed-ppp - INTERFACE + PUBLIC MBED_CONF_PPP_PRESENT=1 ) + +target_link_libraries(mbed-ppp + PUBLIC + mbed-events + mbed-netsocket-api + PRIVATE + mbed-rtos-flags +) \ No newline at end of file diff --git a/connectivity/lwipstack/CMakeLists.txt b/connectivity/lwipstack/CMakeLists.txt index 8c087d84eb..9baff8bb2e 100644 --- a/connectivity/lwipstack/CMakeLists.txt +++ b/connectivity/lwipstack/CMakeLists.txt @@ -96,7 +96,7 @@ target_compile_definitions(mbed-lwipstack target_link_libraries(mbed-lwipstack PUBLIC - mbed-netsocket + mbed-netsocket-api mbed-ppp mbed-randlib PRIVATE diff --git a/connectivity/mbedtls/CMakeLists.txt b/connectivity/mbedtls/CMakeLists.txt index 2f6582e91a..3089a86a80 100644 --- a/connectivity/mbedtls/CMakeLists.txt +++ b/connectivity/mbedtls/CMakeLists.txt @@ -111,6 +111,8 @@ target_compile_definitions(mbed-mbedtls MBED_CONF_MBEDTLS_PRESENT=1 ) +target_link_libraries(mbed-mbedtls PUBLIC mbed-core-flags) + # Workaround for https://github.com/ARMmbed/mbedtls/issues/1077 # which affects cores without __thumb2__ set by the compiler # due to the lack of full Thumb-2 support diff --git a/connectivity/nanostack/CMakeLists.txt b/connectivity/nanostack/CMakeLists.txt index 9ff2685025..eb776561a8 100644 --- a/connectivity/nanostack/CMakeLists.txt +++ b/connectivity/nanostack/CMakeLists.txt @@ -31,5 +31,5 @@ target_link_libraries(mbed-nanostack mbed-nanostack-mbed_mesh_api mbed-nanostack-sal_stack-event_loop mbed-nanostack-sal_stack - mbed-netsocket + mbed-netsocket-api ) diff --git a/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt index e3d7169a1a..42fbaa9dd6 100644 --- a/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt +++ b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api PUBLIC mbed-nanostack-hal_mbed_cmsis_rtos mbed-nanostack-sal_stack - mbed-netsocket + mbed-netsocket-api mbed-core-flags PRIVATE mbed-rtos-flags diff --git a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt index 816622a62e..e435cc45c2 100644 --- a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt +++ b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt @@ -12,7 +12,6 @@ target_sources(mbed-nanostack-hal_mbed_cmsis_rtos PRIVATE arm_hal_fhss_timer.cpp arm_hal_interrupt.c - arm_hal_random.c arm_hal_timer.cpp ns_event_loop.c ns_event_loop_mbed.cpp @@ -26,6 +25,11 @@ target_sources(mbed-nanostack-hal_mbed_cmsis_rtos target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos PUBLIC mbed-core-flags + mbed-randlib + mbed-nanostack-sal_stack-event_loop + mbed-events + mbed-nanostack-libservice + mbed-nanostack-sal_stack PRIVATE mbed-rtos-flags ) \ No newline at end of file diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt index df73a13fd9..c2c779cc38 100644 --- a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt +++ b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CMakeLists.txt @@ -85,7 +85,7 @@ target_sources(mbed-nanostack-sal_stack mle_service/mle_service.c mle_service/mle_service_buffer.c - mle_service/mle_service_frame_counter_table.c + mle_service/mle_service_frame_count.c mle_service/mle_service_interface.c mle_service/mle_service_security.c diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c index 27ff6fda9a..9b921143bb 100644 --- a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c +++ b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c @@ -35,7 +35,7 @@ #include "Service_Libs/mle_service/mle_service_security.h" #include "Service_Libs/mle_service/mle_service_buffer.h" #include "Service_Libs/mle_service/mle_service_interface.h" -#include "Service_Libs/mle_service/mle_service_frame_counter_table.h" +#include "Service_Libs/mle_service/mle_service_frame_count.h" #include "MLE/mle.h" #include "MLE/mle_tlv.h" #include "mac_common_defines.h" diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_count.c similarity index 98% rename from connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.c rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_count.c index 161d1388d2..0f2410ef5e 100644 --- a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.c +++ b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_count.c @@ -27,7 +27,7 @@ #include "MLE/mle.h" #include "mac_common_defines.h" #include "Service_Libs/mle_service/mle_service_api.h" -#include "Service_Libs/mle_service/mle_service_frame_counter_table.h" +#include "Service_Libs/mle_service/mle_service_frame_count.h" diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_count.h similarity index 89% rename from connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.h rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_count.h index 4b0fab63fa..e63d720e71 100644 --- a/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.h +++ b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_count.h @@ -15,8 +15,8 @@ * limitations under the License. */ -#ifndef MLE_SERVICE_FRAME_COUNTER_TABLE_H_ -#define MLE_SERVICE_FRAME_COUNTER_TABLE_H_ +#ifndef MLE_SERVICE_FRAME_COUNT_H_ +#define MLE_SERVICE_FRAME_COUNT_H_ #include /* @@ -32,4 +32,4 @@ typedef struct { //Internal use mle_neighbor_security_counter_info_t *mle_service_counter_info_get(int8_t interface_id, uint8_t attribute_index); -#endif /* MLE_SERVICE_FRAME_COUNTER_TABLE_H_ */ +#endif /* MLE_SERVICE_FRAME_COUNT_H_ */ diff --git a/connectivity/netsocket/CMakeLists.txt b/connectivity/netsocket/CMakeLists.txt index ea64e969a3..cd3b6804a3 100644 --- a/connectivity/netsocket/CMakeLists.txt +++ b/connectivity/netsocket/CMakeLists.txt @@ -3,22 +3,22 @@ if(MBED_OS_ENABLE_TESTS) if(BUILD_GREENTEA_TESTS) - # add greentea test + add_subdirectory(tests/TESTS) else() add_subdirectory(tests/UNITTESTS) endif() endif() -add_library(mbed-netsocket STATIC EXCLUDE_FROM_ALL) +add_library(mbed-netsocket-api STATIC EXCLUDE_FROM_ALL) -target_include_directories(mbed-netsocket +target_include_directories(mbed-netsocket-api PUBLIC . ./include ./include/netsocket ) -target_sources(mbed-netsocket +target_sources(mbed-netsocket-api PRIVATE source/DTLSSocket.cpp source/DTLSSocketWrapper.cpp @@ -44,28 +44,35 @@ target_sources(mbed-netsocket source/nsapi_ppp.cpp ) -target_compile_definitions(mbed-netsocket +target_compile_definitions(mbed-netsocket-api PUBLIC MBED_CONF_NSAPI_PRESENT=1 ) -target_link_libraries(mbed-netsocket +target_link_libraries(mbed-netsocket-api PUBLIC + mbed-core-flags + mbed-mbedtls + mbed-events +) + +add_library(mbed-netsocket INTERFACE) + +target_link_libraries(mbed-netsocket + INTERFACE mbed-mbedtls mbed-lwipstack - mbed-events - mbed-core-flags ) if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS) target_link_libraries(mbed-netsocket - PUBLIC + INTERFACE mbed-emac ) endif() target_link_libraries(mbed-netsocket - PUBLIC + INTERFACE mbed-wifi mbed-cellular mbed-nanostack-libservice diff --git a/connectivity/netsocket/tests/TESTS/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/CMakeLists.txt new file mode 100644 index 0000000000..056f2cd4aa --- /dev/null +++ b/connectivity/netsocket/tests/TESTS/CMakeLists.txt @@ -0,0 +1,6 @@ + +# Only build the netsocket tests if this target has at least one network interface +string(FIND "${MBED_CONFIG_DEFINITIONS}" MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE DEFAULT_IFC_IDX) +if(NOT DEFAULT_IFC_IDX EQUAL -1) + add_subdirectory(netsocket) +endif() \ No newline at end of file diff --git a/connectivity/netsocket/tests/TESTS/netsocket/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/CMakeLists.txt new file mode 100644 index 0000000000..cbd84c3c95 --- /dev/null +++ b/connectivity/netsocket/tests/TESTS/netsocket/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(udp) \ No newline at end of file diff --git a/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt b/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt index f2a112844f..13c6c2d3c8 100644 --- a/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt +++ b/connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt @@ -1,17 +1,7 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) - -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../ CACHE INTERNAL "") -set(TEST_TARGET mbed-connectivity-netsocket-udp) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) - -list( - APPEND +list(APPEND TEST_SOURCE_LIST main.cpp udpsocket_bind_port.cpp @@ -35,7 +25,7 @@ list( mbed_greentea_add_test( TEST_NAME - ${TEST_TARGET} + mbed-connectivity-netsocket-udp TEST_SOURCES ${TEST_SOURCE_LIST} TEST_REQUIRED_LIBS diff --git a/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_echotest_burst.cpp b/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_echotest_burst.cpp index 597afd3afe..23eca8853d 100644 --- a/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_echotest_burst.cpp +++ b/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_echotest_burst.cpp @@ -119,7 +119,7 @@ void UDPSOCKET_ECHOTEST_BURST() } else if (recvd < 0) { pkg_fail += BURST_PKTS - j; // Assume all the following packets of the burst to be lost tr_warn("[%02d] network error %d", i, recvd); - ThisThread::sleep_for(recv_timeout * 1000); + ThisThread::sleep_for(recv_timeout * 1000ms); recv_timeout *= 2; // Back off, break; } else if (temp_addr != udp_addr) { diff --git a/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_recv_timeout.cpp b/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_recv_timeout.cpp index df91b58c2c..410316b387 100644 --- a/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_recv_timeout.cpp +++ b/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_recv_timeout.cpp @@ -63,10 +63,10 @@ void UDPSOCKET_RECV_TIMEOUT() if (recvd == NSAPI_ERROR_WOULD_BLOCK) { osSignalWait(SIGNAL_SIGIO, SIGIO_TIMEOUT); tr_info("MBED: recvfrom() took: %dms", timer.read_ms()); - if (timer.read_ms() > 150) { - TEST_ASSERT(150 - timer.read_ms() < 51); + if (timer.elapsed_time() > 150ms) { + TEST_ASSERT(150ms - timer.elapsed_time() < 51ms); } else { - TEST_ASSERT(timer.read_ms() - 150 < 51); + TEST_ASSERT(timer.elapsed_time() - 150ms < 51ms); } continue; } else if (recvd < 0) { diff --git a/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_sendto_repeat.cpp b/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_sendto_repeat.cpp index 1c71b049c2..4b01a6c51a 100644 --- a/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_sendto_repeat.cpp +++ b/connectivity/netsocket/tests/TESTS/netsocket/udp/udpsocket_sendto_repeat.cpp @@ -46,7 +46,7 @@ void UDPSOCKET_SENDTO_REPEAT() break; } oom_earlier = true; - ThisThread::sleep_for(1000); + ThisThread::sleep_for(1000ms); continue; } oom_earlier = false; diff --git a/platform/randlib/CMakeLists.txt b/platform/randlib/CMakeLists.txt index 1231abf746..cc36934a61 100644 --- a/platform/randlib/CMakeLists.txt +++ b/platform/randlib/CMakeLists.txt @@ -13,4 +13,11 @@ target_include_directories(mbed-randlib target_sources(mbed-randlib PRIVATE source/randLIB.c + source/arm_hal_random.c ) + +target_link_libraries(mbed-randlib + PUBLIC + mbed-mbedtls + mbed-core-flags +) \ No newline at end of file diff --git a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c b/platform/randlib/source/arm_hal_random.c similarity index 100% rename from connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c rename to platform/randlib/source/arm_hal_random.c