From 2557bd6a2ee067d6dfa403b0fd5cd186d722f3a4 Mon Sep 17 00:00:00 2001 From: Maxime JOURDAN - XANTHIO Date: Sat, 8 Jun 2024 15:50:37 +0200 Subject: [PATCH 1/2] find CMSIS only for family under test --- tests/cmsis/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/cmsis/CMakeLists.txt b/tests/cmsis/CMakeLists.txt index 4e4f94e3..f7fd9cd0 100644 --- a/tests/cmsis/CMakeLists.txt +++ b/tests/cmsis/CMakeLists.txt @@ -15,7 +15,8 @@ if(FETCH_ST_SOURCES) stm32_fetch_cmsis(${TEST_FAMILIES}) endif() -find_package(CMSIS REQUIRED) +list(TRANSFORM TEST_FAMILIES PREPEND STM32 OUTPUT_VARIABLE TEST_FAMILIES_LONG_NAMES) +find_package(CMSIS COMPONENTS "${TEST_FAMILIES_LONG_NAMES}" REQUIRED) set(SOURCES main.c) From aae801448d84cbf72ef29fc0be99e82de6191a32 Mon Sep 17 00:00:00 2001 From: Maxime JOURDAN - XANTHIO Date: Sat, 8 Jun 2024 15:51:49 +0200 Subject: [PATCH 2/2] Fix the typo that made the test not creating executable for second core --- tests/cmsis/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cmsis/CMakeLists.txt b/tests/cmsis/CMakeLists.txt index f7fd9cd0..89e9b1da 100644 --- a/tests/cmsis/CMakeLists.txt +++ b/tests/cmsis/CMakeLists.txt @@ -35,7 +35,7 @@ foreach(FAMILY ${TEST_FAMILIES}) add_executable(cmsis-test-${DEVICE} ${SOURCES}) target_link_libraries(cmsis-test-${DEVICE} CMSIS::STM32::${DEVICE} STM32::NoSys) else() - stm32_get_cores(CORES FAMILY ${FAMILY} DEVICE ${DEVICE}) + stm32_get_cores(DEV_CORES FAMILY ${FAMILY} DEVICE ${DEVICE}) foreach(CORE ${DEV_CORES}) stm32_get_memory_info(FAMILY ${FAMILY} DEVICE ${DEVICE} CORE ${CORE} FLASH SIZE FLASH_SIZE) stm32_get_memory_info(FAMILY ${FAMILY} DEVICE ${DEVICE} CORE ${CORE} RAM SIZE RAM_SIZE)