diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt index edef969..16ba418 100644 --- a/connectivity/CMakeLists.txt +++ b/connectivity/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(mbed-emac INTERFACE) add_library(mbed-lorawan INTERFACE) add_library(mbed-lwipstack INTERFACE) -add_library(mbed-mbedtls INTERFACE) +add_library(mbed-mbedtls OBJECT EXCLUDE_FROM_ALL) add_library(mbed-nanostack INTERFACE) add_library(mbed-nanostack-coap_service INTERFACE) add_library(mbed-nanostack-mbed_mesh_api INTERFACE) diff --git a/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt index 24d8764..a7392f1 100644 --- a/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt @@ -8,7 +8,7 @@ add_subdirectory(binaries) target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ./include ./include/cryptocell310 @@ -16,7 +16,7 @@ ) target_sources(mbed-mbedtls - INTERFACE + PRIVATE source/aes_alt.c source/cc_internal.c source/ccm_alt.c @@ -30,6 +30,6 @@ ) target_compile_definitions(mbed-mbedtls - INTERFACE + PUBLIC MBED_CONF_CRYPTOCELL310_PRESENT=1 ) diff --git a/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt index 46726a4..f21c290 100644 --- a/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt @@ -10,17 +10,17 @@ endif() target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) target_sources(mbed-mbedtls - INTERFACE + PRIVATE crypto_device_platform.c ) target_link_libraries(mbed-mbedtls - INTERFACE + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_EXT} ${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_TRNG} ) diff --git a/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt index c8c6f7a..b1cfb1b 100644 --- a/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt @@ -8,6 +8,6 @@ endif() target_link_libraries(mbed-mbedtls - INTERFACE + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_CORE} ) diff --git a/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/CMakeLists.txt index dc35231..bdc5235 100644 --- a/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/CMakeLists.txt @@ -8,12 +8,12 @@ endif() target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) target_sources(mbed-mbedtls - INTERFACE + PRIVATE aes_alt.c crypto_common.c ecdsa_alt.c diff --git a/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/CMakeLists.txt index 23860a7..71430ad 100644 --- a/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ./aes ./des @@ -10,7 +10,7 @@ ) target_sources(mbed-mbedtls - INTERFACE + PRIVATE aes/aes_alt.c des/des_alt.c diff --git a/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/CMakeLists.txt index e881839..ceb3075 100644 --- a/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/CMakeLists.txt @@ -6,7 +6,7 @@ endif() target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ./aes ./des @@ -14,7 +14,7 @@ ) target_sources(mbed-mbedtls - INTERFACE + PRIVATE aes/aes_alt.c des/des_alt.c diff --git a/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/CMakeLists.txt index e944974..66b58e6 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/CMakeLists.txt @@ -20,7 +20,7 @@ endif() target_sources(mbed-mbedtls - INTERFACE + PRIVATE aes_alt.cpp aes_alt_stm32l4.c ccm_alt.cpp @@ -33,6 +33,6 @@ ) target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F439xI/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F439xI/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F439xI/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F439xI/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L4S5xI/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L4S5xI/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L4S5xI/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L4S5xI/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB/CMakeLists.txt index 115af52..00a3c76 100644 --- a/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB/CMakeLists.txt @@ -2,6 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) diff --git a/connectivity/drivers/mbedtls/TARGET_Samsung/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_Samsung/CMakeLists.txt index 204b958..d9da023 100644 --- a/connectivity/drivers/mbedtls/TARGET_Samsung/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_Samsung/CMakeLists.txt @@ -2,13 +2,13 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ./sha ) target_sources(mbed-mbedtls - INTERFACE + PRIVATE sha/sha256_alt.c sha/sha512_alt.c ) diff --git a/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/CMakeLists.txt b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/CMakeLists.txt index bba9629..57d8907 100644 --- a/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/CMakeLists.txt +++ b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/CMakeLists.txt @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ) target_sources(mbed-mbedtls - INTERFACE + PRIVATE aes_aes.c crypto_aes.c crypto_ecp.c diff --git a/connectivity/mbedtls/CMakeLists.txt b/connectivity/mbedtls/CMakeLists.txt index 68e7e4c..2f6582e 100644 --- a/connectivity/mbedtls/CMakeLists.txt +++ b/connectivity/mbedtls/CMakeLists.txt @@ -8,7 +8,7 @@ endif() target_include_directories(mbed-mbedtls - INTERFACE + PUBLIC . ./include ./include/mbedtls @@ -17,7 +17,7 @@ ) target_sources(mbed-mbedtls - INTERFACE + PRIVATE platform/src/hash_wrappers.c platform/src/mbed_trng.cpp platform/src/platform_alt.cpp @@ -107,7 +107,7 @@ ) target_compile_definitions(mbed-mbedtls - INTERFACE + PUBLIC MBED_CONF_MBEDTLS_PRESENT=1 ) @@ -123,7 +123,7 @@ ) if(MBED_CPU_CORE IN_LIST partial-thumb2-cores) target_compile_definitions(mbed-mbedtls - INTERFACE + PUBLIC MULADDC_CANNOT_USE_R7 ) endif() diff --git a/hal/tests/TESTS/CMakeLists.txt b/hal/tests/TESTS/CMakeLists.txt index 1197616..cab1c20 100644 --- a/hal/tests/TESTS/CMakeLists.txt +++ b/hal/tests/TESTS/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(mbed_hal) \ No newline at end of file +add_subdirectory(mbed_hal) +add_subdirectory(pin_names) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/CMakeLists.txt index 1be1ec9..d1bafbe 100644 --- a/hal/tests/TESTS/mbed_hal/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/CMakeLists.txt @@ -5,4 +5,22 @@ add_subdirectory(flash/functional_tests) add_subdirectory(lp_ticker) add_subdirectory(minimum_requirements) -add_subdirectory(reset_reason) \ No newline at end of file +add_subdirectory(mpu) +add_subdirectory(ospi) +add_subdirectory(pinmap) +add_subdirectory(qspi) +add_subdirectory(reset_reason) +add_subdirectory(rtc) +add_subdirectory(rtc_reset) +add_subdirectory(rtc_time) +add_subdirectory(rtc_time_conv) +add_subdirectory(sleep) +add_subdirectory(sleep_manager) +add_subdirectory(sleep_manager_racecondition) +add_subdirectory(stack_size_unification) +add_subdirectory(ticker) +add_subdirectory(trng) +add_subdirectory(us_ticker) +add_subdirectory(watchdog) +add_subdirectory(watchdog_reset) +add_subdirectory(watchdog_timing) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt index 15902ac..7beb72b 100644 --- a/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/crc/CMakeLists.txt @@ -1,6 +1,10 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +if(NOT "DEVICE_CRC=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "CRC is not supported for this target") +endif() + mbed_greentea_add_test( TEST_NAME mbed-hal-crc @@ -8,4 +12,6 @@ main.cpp HOST_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} ) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/flash/functional_tests/main.cpp b/hal/tests/TESTS/mbed_hal/flash/functional_tests/main.cpp index d2a5a75..46a9a7b 100644 --- a/hal/tests/TESTS/mbed_hal/flash/functional_tests/main.cpp +++ b/hal/tests/TESTS/mbed_hal/flash/functional_tests/main.cpp @@ -44,17 +44,6 @@ static int timer_diff_start; -static void erase_range(flash_t *flash, uint32_t addr, uint32_t size) -{ - while (size > 0) { - uint32_t sector_size = flash_get_sector_size(flash, addr); - TEST_ASSERT_NOT_EQUAL(0, sector_size); - int32_t ret = flash_erase_sector(flash, addr); - TEST_ASSERT_EQUAL_INT32(0, ret); - addr += sector_size; - size = size > sector_size ? size - sector_size : 0; - } -} #if defined (__ICCARM__) MBED_NOINLINE static void delay_loop(uint32_t count) diff --git a/hal/tests/TESTS/mbed_hal/mpu/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/mpu/CMakeLists.txt index 13bef3b..cae7069 100644 --- a/hal/tests/TESTS/mbed_hal/mpu/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/mpu/CMakeLists.txt @@ -1,18 +1,11 @@ # 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-hal-mpu) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) - mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp + TEST_NAME + mbed-hal-mpu + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests ) diff --git a/hal/tests/TESTS/mbed_hal/ospi/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/ospi/CMakeLists.txt index 7fae404..bf993a9 100644 --- a/hal/tests/TESTS/mbed_hal/ospi/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/ospi/CMakeLists.txt @@ -1,21 +1,18 @@ # 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-hal-ospi) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_OSPI=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "OSPI is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp - ospi_test_utils.cpp - TEST_INCLUDE_DIRS - flash_configs + TEST_NAME + mbed-hal-ospi + TEST_SOURCES + main.cpp + ospi_test_utils.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/hal/tests/TESTS/mbed_hal/pinmap/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/pinmap/CMakeLists.txt index 4b9e217..c4095a9 100644 --- a/hal/tests/TESTS/mbed_hal/pinmap/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/pinmap/CMakeLists.txt @@ -1,18 +1,11 @@ # 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-hal-pinmap) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) - mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp + TEST_NAME + mbed-hal-pinmap + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests ) diff --git a/hal/tests/TESTS/mbed_hal/qspi/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/qspi/CMakeLists.txt index b06f73c..3f53284 100644 --- a/hal/tests/TESTS/mbed_hal/qspi/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/qspi/CMakeLists.txt @@ -1,15 +1,6 @@ # Copyright (c) 2020-2021 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-hal-qspi) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) - if(TARGET mbed-ep-agora) set(FLASH_TARGET_CONFIG_HEADER NORDIC/EP_AGORA) elseif(TARGET mbed-nrf52840-dk) @@ -22,6 +13,11 @@ set(FLASH_TARGET_CONFIG_HEADER SiliconLabs/EFM32GG11_STK3701) endif() +if(NOT "DEVICE_QSPI=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "QSPI is not supported for this target") +endif() + + list( APPEND TEST_HEADER_DIRS @@ -30,12 +26,15 @@ ) mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp + TEST_NAME + mbed-hal-qspi + TEST_SOURCES + main.cpp qspi_test_utils.cpp TEST_INCLUDE_DIRS ${TEST_HEADER_DIRS} + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} ) - diff --git a/hal/tests/TESTS/mbed_hal/rtc/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/rtc/CMakeLists.txt index 290eaef..359b159 100644 --- a/hal/tests/TESTS/mbed_hal/rtc/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/rtc/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-rtc) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_RTC=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "RTC is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp + TEST_NAME + mbed-hal-rtc + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/hal/tests/TESTS/mbed_hal/rtc_reset/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/rtc_reset/CMakeLists.txt index b71ff00..594de38 100644 --- a/hal/tests/TESTS/mbed_hal/rtc_reset/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/rtc_reset/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-rtc-reset) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_RTC=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "RTC is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-rtc-reset + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/rtc_time/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/rtc_time/CMakeLists.txt index 5f7d1f8..bdbb47e 100644 --- a/hal/tests/TESTS/mbed_hal/rtc_time/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/rtc_time/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-rtc-time) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_RTC=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "RTC is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-rtc-time + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/rtc_time_conv/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/rtc_time_conv/CMakeLists.txt index 96b56f7..2f319d0 100644 --- a/hal/tests/TESTS/mbed_hal/rtc_time_conv/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/rtc_time_conv/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-rtc-time-conv) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_RTC=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "RTC is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-rtc-time-conv + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/sleep/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/sleep/CMakeLists.txt index aed5bab..2f9e403 100644 --- a/hal/tests/TESTS/mbed_hal/sleep/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/sleep/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-sleep) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_SLEEP=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Sleep is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp + TEST_NAME + mbed-hal-sleep + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/hal/tests/TESTS/mbed_hal/sleep_manager/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/sleep_manager/CMakeLists.txt index 3dc375f..77f3667 100644 --- a/hal/tests/TESTS/mbed_hal/sleep_manager/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/sleep_manager/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-sleep-manager) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_SLEEP=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Sleep is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp + TEST_NAME + mbed-hal-sleep-manager + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} ) diff --git a/hal/tests/TESTS/mbed_hal/sleep_manager_racecondition/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/sleep_manager_racecondition/CMakeLists.txt index df182d5..add05e0 100644 --- a/hal/tests/TESTS/mbed_hal/sleep_manager_racecondition/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/sleep_manager_racecondition/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-sleep-manager-racecondition) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_SLEEP=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Sleep is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-sleep-manager-racecondition + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/stack_size_unification/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/stack_size_unification/CMakeLists.txt index 9f3d536..a43691b 100644 --- a/hal/tests/TESTS/mbed_hal/stack_size_unification/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/stack_size_unification/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-stack-size-unification) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "TARGET_CORTEX_A" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Not supported for Cortex-A targets") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-stack-size-unification + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/ticker/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/ticker/CMakeLists.txt index 4352cba..30e215e 100644 --- a/hal/tests/TESTS/mbed_hal/ticker/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/ticker/CMakeLists.txt @@ -1,18 +1,11 @@ # 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-hal-ticker) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) - mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-ticker + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests +) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/trng/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/trng/CMakeLists.txt index 344d44a..aac007b 100644 --- a/hal/tests/TESTS/mbed_hal/trng/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/trng/CMakeLists.txt @@ -1,14 +1,9 @@ # 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-hal-trng) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_TRNG=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "True RNG is not supported for this target") +endif() list( APPEND @@ -26,10 +21,16 @@ ) mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - ${TEST_SOURCE_LIST} - TEST_INCLUDE_DIRS + TEST_NAME + mbed-hal-trng + TEST_SOURCES + ${TEST_SOURCE_LIST} + TEST_INCLUDE_DIRS ${TEST_INC_DIRS} + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} + TEST_REQUIRED_LIBS + mbed-mbedtls ) diff --git a/hal/tests/TESTS/mbed_hal/us_ticker/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/us_ticker/CMakeLists.txt index d04c496..8557893 100644 --- a/hal/tests/TESTS/mbed_hal/us_ticker/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/us_ticker/CMakeLists.txt @@ -1,18 +1,11 @@ # 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-hal-us-ticker) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) - mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp + TEST_NAME + mbed-hal-us-ticker + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests ) diff --git a/hal/tests/TESTS/mbed_hal/watchdog/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/watchdog/CMakeLists.txt index e216dfa..5af3f1a 100644 --- a/hal/tests/TESTS/mbed_hal/watchdog/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/watchdog/CMakeLists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR) +if(NOT "DEVICE_WATCHDOG=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Watchdog is not supported for this target") +endif() -set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../.. CACHE INTERNAL "") -set(TEST_TARGET mbed-hal-watchdog) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-watchdog + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/watchdog_reset/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/watchdog_reset/CMakeLists.txt index 347ba68..acd0f43 100644 --- a/hal/tests/TESTS/mbed_hal/watchdog_reset/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/watchdog_reset/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-watchdog-reset) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_WATCHDOG=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Watchdog is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-watchdog-reset + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/hal/tests/TESTS/mbed_hal/watchdog_timing/CMakeLists.txt b/hal/tests/TESTS/mbed_hal/watchdog_timing/CMakeLists.txt index 6ecc6f9..e5c2df5 100644 --- a/hal/tests/TESTS/mbed_hal/watchdog_timing/CMakeLists.txt +++ b/hal/tests/TESTS/mbed_hal/watchdog_timing/CMakeLists.txt @@ -1,18 +1,17 @@ # 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-hal-watchdog-timing) - -include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake) - -project(${TEST_TARGET}) +if(NOT "DEVICE_WATCHDOG=1" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Watchdog is not supported for this target") +endif() mbed_greentea_add_test( - TEST_NAME - ${TEST_TARGET} - TEST_SOURCES - main.cpp -) + TEST_NAME + mbed-hal-watchdog-timing + TEST_SOURCES + main.cpp + HOST_TESTS_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/../../host_tests + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/hal/tests/TESTS/pin_names/CMakeLists.txt b/hal/tests/TESTS/pin_names/CMakeLists.txt new file mode 100644 index 0000000..339380c --- /dev/null +++ b/hal/tests/TESTS/pin_names/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(arduino_uno) \ No newline at end of file diff --git a/hal/tests/TESTS/pin_names/arduino_uno/CMakeLists.txt b/hal/tests/TESTS/pin_names/arduino_uno/CMakeLists.txt new file mode 100644 index 0000000..24e1c5f --- /dev/null +++ b/hal/tests/TESTS/pin_names/arduino_uno/CMakeLists.txt @@ -0,0 +1,15 @@ +# Copyright (c) 2022 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +if(NOT "TARGET_FF_ARDUINO_UNO" IN_LIST MBED_TARGET_DEFINITIONS) + set(TEST_SKIPPED "Target does not claim to implement the Arduino Uno form factor") +endif() + +mbed_greentea_add_test( + TEST_NAME + mbed-hal-verify-arduino-pinmap + TEST_SOURCES + main.cpp + TEST_SKIPPED + ${TEST_SKIPPED} +) \ No newline at end of file diff --git a/tools/cmake/mbed_create_distro.cmake b/tools/cmake/mbed_create_distro.cmake index d11b9ca..a73b717 100644 --- a/tools/cmake/mbed_create_distro.cmake +++ b/tools/cmake/mbed_create_distro.cmake @@ -56,7 +56,7 @@ # CMake currently has a limitation that OBJECT libraries cannot link to other OBJECT libraries # via the LINK_LIBRARIES property -- CMake will not link the objects in properly :/. # see: https://cmake.org/pipermail/cmake/2019-May/069453.html - # Once the INTERFACE_LINK_LIBRARIES_DIRECT property becomes widely available we could use that instead to fix this. + # also: https://gitlab.kitware.com/cmake/cmake/-/issues/18090 get_property(CURR_MODULE_TYPE TARGET ${CURR_MODULE} PROPERTY TYPE) if("${CURR_MODULE_TYPE}" STREQUAL "OBJECT_LIBRARY") target_sources(${NAME} INTERFACE $)