Skip to content

Commit 322bcbf

Browse files
committed
CMake tools: remove MBED_PATH, use <PROJECT_NAME>_SOURCE_DIR
1 parent b509444 commit 322bcbf

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ function(mbed_generate_map_file target)
216216
TARGET
217217
${target}
218218
POST_BUILD
219-
COMMAND ${Python3_EXECUTABLE} ${MBED_PATH}/tools/memap.py -t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
219+
COMMAND ${Python3_EXECUTABLE} ${mbed-os_SOURCE_DIR}/tools/memap.py -t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
220220
WORKING_DIRECTORY
221221
${CMAKE_CURRENT_BINARY_DIR}
222222
COMMENT

tools/cmake/app.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ include(${MBED_CONFIG_PATH}/mbed_config.cmake)
1212
# Load toolchain file
1313
if(NOT CMAKE_TOOLCHAIN_FILE OR MBED_TOOLCHAIN_FILE_USED)
1414
set(MBED_TOOLCHAIN_FILE_USED TRUE CACHE INTERNAL "")
15-
include(${MBED_PATH}/tools/cmake/toolchain.cmake)
15+
include(${mbed-os_SOURCE_DIR}/tools/cmake/toolchain.cmake)
1616
endif()
1717

1818
# Specify available build profiles and add options for the selected build profile
19-
include(${MBED_PATH}/tools/cmake/profile.cmake)
19+
include(${mbed-os_SOURCE_DIR}/tools/cmake/profile.cmake)
2020

2121
enable_language(C CXX ASM)
2222

tools/cmake/mbed_greentea.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
set(MBED_CONFIG_PATH ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "")
55

6-
include(${MBED_PATH}/tools/cmake/app.cmake)
6+
include(${mbed-os_SOURCE_DIR}/tools/cmake/app.cmake)
77

88
# CMake Macro for generalizing CMake configuration across the greentea test suite with configurable parameters
99
# Macro args:
@@ -37,7 +37,7 @@ macro(mbed_greentea_add_test)
3737

3838
set(TEST_NAME ${MBED_GREENTEA_TEST_NAME})
3939

40-
add_subdirectory(${MBED_PATH} build)
40+
add_subdirectory(${mbed-os_SOURCE_DIR} build)
4141

4242
add_executable(${TEST_NAME})
4343

tools/cmake/profile.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ else()
2929
endif()
3030
endif()
3131

32-
include(${MBED_PATH}/tools/cmake/profiles/${LOWERCASE_CMAKE_BUILD_TYPE}.cmake)
32+
include(${mbed-os_SOURCE_DIR}/tools/cmake/profiles/${LOWERCASE_CMAKE_BUILD_TYPE}.cmake)

0 commit comments

Comments
 (0)