diff --git a/CMakeLists.txt b/CMakeLists.txt index 790f64daa19..3127af55ccc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,16 +152,6 @@ function(mbed_configure_app_target target) # using global properties. mbed_generate_options_for_linker(${target} LINKER_PREPROCESS_DEFINITIONS) set_property(GLOBAL PROPERTY COMPILE_DEFS_RESPONSE_FILE ${LINKER_PREPROCESS_DEFINITIONS}) - - # Gcc Arm requires memap to be set with app name, equally to ARMClang - # TODO: move this to toolchain and set properly - if(MBED_TOOLCHAIN STREQUAL "GCC_ARM") - message(${target}) - target_link_options(mbed-core - INTERFACE - "-Wl,-Map=${CMAKE_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map" - ) - endif() endfunction() # @@ -200,7 +190,16 @@ endfunction() # Parse toolchain generated map file of `target` and display a readable table format. # function(mbed_generate_map_file target) - add_custom_command( + + if(MBED_TOOLCHAIN STREQUAL "GCC_ARM") + # Tell GCC to generate the map file needed by memap + target_link_options(${target} + PRIVATE + "-Wl,-Map=${CMAKE_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map" + ) + endif() + + add_custom_command( TARGET ${target} POST_BUILD diff --git a/tools/cmake/app.cmake b/tools/cmake/app.cmake index 8d7318c1d03..e41ed50170f 100644 --- a/tools/cmake/app.cmake +++ b/tools/cmake/app.cmake @@ -55,3 +55,6 @@ else() message(STATUS "Missing Python dependencies (python3, intelhex, prettytable) so the memory map cannot be printed") endif() +# load mbed_create_distro +include(${CMAKE_CURRENT_LIST_DIR}/create_distro.cmake) + diff --git a/tools/cmake/create_distro.cmake b/tools/cmake/create_distro.cmake new file mode 100644 index 00000000000..29935396db1 --- /dev/null +++ b/tools/cmake/create_distro.cmake @@ -0,0 +1,76 @@ +# Copyright (c) 2021 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +# This script provides mbed_create_distro(), a function that lets you compile multiple +# apps that use Mbed OS without waiting for Mbed OS to build multiple times. + +# You can use it like this: +# mbed_create_distro(mbed_for_my_app mbed-os mbed-storage-kvstore mbed-storage-filesystem) +# +# add_executable(myapp1 MyApp1.cpp) +# target_link_libraries(myapp1 PRIVATE mbed_for_my_app) +# mbed_set_post_build(myapp1) +# +# add_executable(myapp2 MyApp2.cpp) +# target_link_libraries(myapp2 PRIVATE mbed_for_my_app) +# mbed_set_post_build(myapp2) +# +# Both myapp1 and myapp2 will act like they were linked to mbed-os, mbed-storage-kvstore, +# and mbed-storage-filesystem. If you actually did that, it would compile a new version +# of the source files for each target. However, using mbed_create_distro(), +# mbed_for_my_app will only be compiled once. + +# Append the value of PROPERTY from SOURCE to the value of PROPERTY on DESTINATION +function(copy_append_property PROPERTY SOURCE DESTINATION) + get_property(PROP_IS_DEFINED TARGET ${SOURCE} PROPERTY ${PROPERTY} SET) + if(PROP_IS_DEFINED) + get_property(PROP_VALUE TARGET ${SOURCE} PROPERTY ${PROPERTY}) + #message("Copying ${PROPERTY} from ${SOURCE} -> ${DESTINATION}: ${PROP_VALUE} ") + set_property(TARGET ${DESTINATION} APPEND PROPERTY ${PROPERTY} "${PROP_VALUE}") + endif() +endfunction(copy_append_property) + +# Create a "distribution" of Mbed OS containing the base Mbed and certain modules. +# This distribution only needs to be compiled once and can be referenced in an arbitrary amount of targets. +function(mbed_create_distro NAME) # ARGN: modules... + add_library(${NAME} OBJECT) + mbed_configure_app_target(${NAME}) + + # First link as private dependencies + target_link_libraries(${NAME} PRIVATE ${ARGN}) + + # Now copy include dirs, compile defs, and compile options (but NOT interface source files) over + # to the distribution target so they will be passed into things that link to it. + # To do this, we need to recursively traverse the tree of dependencies. + set(REMAINING_MODULES ${ARGN}) + set(COMPLETED_MODULES ${ARGN}) + while(NOT "${REMAINING_MODULES}" STREQUAL "") + + list(GET REMAINING_MODULES 0 CURR_MODULE) + + #message("Processing ${CURR_MODULE}") + + copy_append_property(INTERFACE_COMPILE_DEFINITIONS ${CURR_MODULE} ${NAME}) + copy_append_property(INTERFACE_COMPILE_OPTIONS ${CURR_MODULE} ${NAME}) + copy_append_property(INTERFACE_INCLUDE_DIRECTORIES ${CURR_MODULE} ${NAME}) + copy_append_property(INTERFACE_LINK_OPTIONS ${CURR_MODULE} ${NAME}) + + list(REMOVE_AT REMAINING_MODULES 0) + list(APPEND COMPLETED_MODULES ${CURR_MODULE}) + + # find sub-modules of this module + get_property(SUBMODULES TARGET ${CURR_MODULE} PROPERTY INTERFACE_LINK_LIBRARIES) + #message("Deps of ${CURR_MODULE}: ${SUBMODULES}") + foreach(SUBMODULE ${SUBMODULES}) + if(NOT "${SUBMODULE}" MATCHES "::@") # remove CMake internal CMAKE_DIRECTORY_ID_SEP markers + if(NOT ${SUBMODULE} IN_LIST COMPLETED_MODULES) + list(APPEND REMAINING_MODULES ${SUBMODULE}) + endif() + endif() + endforeach() + + #message("REMAINING_MODULES: ${REMAINING_MODULES}") + + endwhile() + +endfunction(mbed_create_distro) \ No newline at end of file diff --git a/tools/cmake/set_linker_script.cmake b/tools/cmake/set_linker_script.cmake index dc92a52fd68..3cbbc89802d 100644 --- a/tools/cmake/set_linker_script.cmake +++ b/tools/cmake/set_linker_script.cmake @@ -3,6 +3,7 @@ # # Preprocesses and sets the linker script for an Mbed target. +# Called once for each MCU target in the build system. # function(mbed_set_linker_script input_target raw_linker_script_path) set(LINKER_SCRIPT_PATH ${CMAKE_BINARY_DIR}/${input_target}.link_script.ld) diff --git a/tools/cmake/toolchain.cmake b/tools/cmake/toolchain.cmake index 8d151ecc08f..fd93fd9624a 100644 --- a/tools/cmake/toolchain.cmake +++ b/tools/cmake/toolchain.cmake @@ -19,8 +19,8 @@ function(mbed_generate_options_for_linker target definitions_file) set(_compile_definitions "$<$:-D$>" ) - file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/compile_time_defs.txt" CONTENT "${_compile_definitions}\n") - set(${definitions_file} @${CMAKE_BINARY_DIR}/compile_time_defs.txt PARENT_SCOPE) + file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/${target}.compile_time_defs.txt" CONTENT "${_compile_definitions}\n") + set(${definitions_file} @${CMAKE_BINARY_DIR}/${target}.compile_time_defs.txt PARENT_SCOPE) endfunction() # Set the system processor depending on the CPU core type if (MBED_CPU_CORE STREQUAL Cortex-A9)