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

CMake tools: use CMAKE_CURRENT_LIST_DIR instead of MBED_PATH 

Excluding greentea tests, they will be fixed separately (more work needed).
pull/14516/head
Martin Kojtal 2021-04-08 13:38:09 +01:00
parent afd938491a
commit b88d5687e2
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -216,7 +216,7 @@ function(mbed_generate_map_file target)
TARGET
${target}
POST_BUILD
COMMAND ${Python3_EXECUTABLE} ${MBED_PATH}/tools/memap.py -t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
COMMAND ${Python3_EXECUTABLE} ${mbed-os_SOURCE_DIR}/tools/memap.py -t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
WORKING_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}
COMMENT

4
tools/cmake/app.cmake
View File

@ -12,11 +12,11 @@ include(${MBED_CONFIG_PATH}/mbed_config.cmake)
# Load toolchain file
if(NOT CMAKE_TOOLCHAIN_FILE OR MBED_TOOLCHAIN_FILE_USED)
set(MBED_TOOLCHAIN_FILE_USED TRUE CACHE INTERNAL "")
include(${MBED_PATH}/tools/cmake/toolchain.cmake)
include(${mbed-os_SOURCE_DIR}/tools/cmake/toolchain.cmake)
endif()
# Specify available build profiles and add options for the selected build profile
include(${MBED_PATH}/tools/cmake/profile.cmake)
include(${mbed-os_SOURCE_DIR}/tools/cmake/profile.cmake)
enable_language(C CXX ASM)

2
tools/cmake/mbed_greentea.cmake
View File

@ -3,7 +3,7 @@
set(MBED_CONFIG_PATH ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "")
include(${MBED_PATH}/tools/cmake/app.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/app.cmake)
# CMake Macro for generalizing CMake configuration across the greentea test suite with configurable parameters
# Macro args:

2
tools/cmake/profile.cmake
View File

@ -29,4 +29,4 @@ else()
endif()
endif()
include(${MBED_PATH}/tools/cmake/profiles/${LOWERCASE_CMAKE_BUILD_TYPE}.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/profiles/${LOWERCASE_CMAKE_BUILD_TYPE}.cmake)

4
tools/cmake/toolchain.cmake
View File

@ -100,8 +100,8 @@ set(link_options "")
set(common_options "")
set(c_cxx_compile_options "") # compile options only for C/CXX
set(asm_compile_options "") # compile options only for ASM
include(${MBED_PATH}/tools/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)
include(${MBED_PATH}/tools/cmake/cores/${MBED_CPU_CORE}.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/toolchains/${MBED_TOOLCHAIN}.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/cores/${MBED_CPU_CORE}.cmake)
#converts a list into a string with each of its elements seperated by a space
macro(list_to_space_separated OUTPUT_VAR)# 2nd arg: LIST...