ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
pull/14316/head
Hugues Kamba 2021-02-22 13:38:32 +00:00
parent 29cfcd6d5f
commit 80c679cc27
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt
View File

@ -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 # SPDX-License-Identifier: Apache-2.0
add_subdirectory(TARGET_MAX32625MBED EXCLUDE_FROM_ALL) add_subdirectory(TARGET_MAX32625MBED EXCLUDE_FROM_ALL)
@ -70,3 +70,5 @@ target_sources(mbed-max32625
${STARTUP_FILE} ${STARTUP_FILE}
) )
target_link_libraries(mbed-max32625 INTERFACE mbed-maxim)

6
targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt
View File

@ -1,11 +1,11 @@
# Copyright (c) 2020-2021 ARM Limited. All rights reserved. # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 # 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 INTERFACE
. .
) )
target_link_libraries(mbed-sdt32625bp INTERFACE mbed-max32625 mbed-max32625-no-boot) target_link_libraries(mbed-sdt32625b INTERFACE mbed-max32625-no-boot)

8
targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt
View File

@ -11,12 +11,16 @@ endif()
mbed_set_linker_script(mbed-max32625-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_BOOT}) 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) add_library(mbed-max32625-no-boot INTERFACE)
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") 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") 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() endif()
mbed_set_linker_script(mbed-max32625-no-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_NO_BOOT}) 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)