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

CMake: linker script preprocessing moved to mbed_configure_app_target 

This fixes the problem for an app/test to define APP_TARGET as requirements. This is not a proper fix
but rather a workaround for broken apps/tests currently. We will address this separately via new
pull request.
pull/14265/head
Martin Kojtal 2021-02-10 11:07:09 +00:00
parent b3344390dd
commit d22772342c
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -94,15 +94,6 @@ target_include_directories(mbed-core
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
# We need to generate a "response file" to pass to the C preprocessor because of path length
# limitations on Windows. We set the response file and bind the path to a global property here.
# We query this global property when we set the linker script for the MBED_TARGET being built.
#
# TODO: Remove this and find a more idiomatic way of passing compile definitions to CPP without
# using global properties.
mbed_generate_options_for_linker(${APP_TARGET} LINKER_PREPROCESS_DEFINITIONS)
set_property(GLOBAL PROPERTY COMPILE_DEFS_RESPONSE_FILE ${LINKER_PREPROCESS_DEFINITIONS})
# These targets are made visible here so their source files which # These targets are made visible here so their source files which
# are spread in different directories can be referenced and can be linked against # are spread in different directories can be referenced and can be linked against
# by libraries that depend on them. # by libraries that depend on them.
@ -143,6 +134,20 @@ else()
mbed_set_linker_script(mbed-core ${LINKER_SCRIPT}) mbed_set_linker_script(mbed-core ${LINKER_SCRIPT})
endif() endif()
#
# Configures the application
#
function(mbed_configure_app_target target)
# We need to generate a "response file" to pass to the C preprocessor because of path length
# limitations on Windows. We set the response file and bind the path to a global property here.
# We query this global property when we set the linker script for the MBED_TARGET being built.
#
# TODO: Remove this and find a more idiomatic way of passing compile definitions to CPP without
# using global properties.
mbed_generate_options_for_linker(${target} LINKER_PREPROCESS_DEFINITIONS)
set_property(GLOBAL PROPERTY COMPILE_DEFS_RESPONSE_FILE ${LINKER_PREPROCESS_DEFINITIONS})
endfunction()
# #
# Converts output file of `target` to binary file and to Intel HEX file. # Converts output file of `target` to binary file and to Intel HEX file.
# #