From 80c679cc27ce452ce772251991a76c444b2a71e4 Mon Sep 17 00:00:00 2001 From: Hugues Kamba Date: Mon, 22 Feb 2021 13:38:32 +0000 Subject: [PATCH] MAX32625: Fix CMake build * Correct board CMake target name to match board name * Make MAX32625 depend on MAXIM CMake target to inherit its include dirs * Correct path to linker files --- targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt | 4 +++- .../TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt | 6 +++--- .../TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt | 8 ++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt index b8eb60a74f..e95dfb4775 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 add_subdirectory(TARGET_MAX32625MBED EXCLUDE_FROM_ALL) @@ -70,3 +70,5 @@ target_sources(mbed-max32625 ${STARTUP_FILE} ) + +target_link_libraries(mbed-max32625 INTERFACE mbed-maxim) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt index 36b7a94165..e3691fbbd4 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt @@ -1,11 +1,11 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(mbed-sdt32625bp INTERFACE) +add_library(mbed-sdt32625b INTERFACE) -target_include_directories(mbed-sdt32625bp +target_include_directories(mbed-sdt32625b INTERFACE . ) -target_link_libraries(mbed-sdt32625bp INTERFACE mbed-max32625 mbed-max32625-no-boot) +target_link_libraries(mbed-sdt32625b INTERFACE mbed-max32625-no-boot) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt index eac4b167b1..90c4fc6dac 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt @@ -11,12 +11,16 @@ endif() mbed_set_linker_script(mbed-max32625-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_BOOT}) +target_link_libraries(mbed-max32625-boot INTERFACE mbed-max32625) + add_library(mbed-max32625-no-boot INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_NO_BOOT device/TOOLCHAIN_GCC_ARM/TARGET_MAX32625_NO_BOOT/max32625.ld) + set(LINKER_FILE_NO_BOOT TOOLCHAIN_GCC_ARM/TARGET_MAX32625_NO_BOOT/max32625.ld) elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_NO_BOOT device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_NO_BOOT/MAX32625.sct) + set(LINKER_FILE_NO_BOOT TOOLCHAIN_ARM_STD/TARGET_MAX32625_NO_BOOT/MAX32625.sct) endif() mbed_set_linker_script(mbed-max32625-no-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_NO_BOOT}) + +target_link_libraries(mbed-max32625-no-boot INTERFACE mbed-max32625)