Skip to content

Commit f59e949

Browse files
authored
Merge pull request #13866 from hugueskamba/hk_cmake_rename_variable
CMake: Rename Mbed OS path variable for consistency
2 parents d64133e + 664c040 commit f59e949

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ if(POLICY CMP0076)
1010
cmake_policy(SET CMP0076 NEW)
1111
endif()
1212

13-
include(${MBED_ROOT}/tools/cmake/core.cmake)
14-
include(${MBED_ROOT}/tools/cmake/profile.cmake)
13+
include(${MBED_PATH}/tools/cmake/core.cmake)
14+
include(${MBED_PATH}/tools/cmake/profile.cmake)
1515

1616
add_library(mbed-core INTERFACE)
1717

@@ -185,7 +185,7 @@ function(mbed_generate_map_file target)
185185
TARGET
186186
${target}
187187
POST_BUILD
188-
COMMAND ${Python3_EXECUTABLE} ${MBED_ROOT}/tools/memap.py -t ${MBED_TOOLCHAIN} -d 4 ${CMAKE_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
188+
COMMAND ${Python3_EXECUTABLE} ${MBED_PATH}/tools/memap.py -t ${MBED_TOOLCHAIN} -d 4 ${CMAKE_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
189189
WORKING_DIRECTORY
190190
${CMAKE_BINARY_DIR}
191191
COMMENT

docs/design-documents/tools/cmake.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The next sections will describe static CMake files within Mbed OS Core repositor
4646

4747
The `CMakeLists.txt` entry point in the root of the Mbed OS repository contains the top level build specification for Mbed OS. This file also includes the auto generated `mbed_config.cmake` script, which is created by `mbed-tools`.
4848

49-
This is not intended to be included by an application. Applications must use `add_subdirectory(${MBED_ROOT})`.
49+
This is not intended to be included by an application. Applications must use `add_subdirectory(${MBED_PATH})`.
5050

5151
### 2. Toolchain CMake Scripts
5252

tools/cmake/app.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ include(${MBED_CONFIG_PATH}/mbed_config.cmake)
1111

1212
# Set default toolchain file
1313
if(NOT CMAKE_TOOLCHAIN_FILE)
14-
set(CMAKE_TOOLCHAIN_FILE "${MBED_ROOT}/tools/cmake/toolchain.cmake" CACHE INTERNAL "")
14+
set(CMAKE_TOOLCHAIN_FILE "${MBED_PATH}/tools/cmake/toolchain.cmake" CACHE INTERNAL "")
1515
endif()
1616

1717
# Toolchain setup
18-
include(${MBED_ROOT}/tools/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)
18+
include(${MBED_PATH}/tools/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)
1919
enable_language(C CXX ASM)

tools/cmake/core.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
include(${MBED_ROOT}/tools/cmake/cores/${MBED_CPU_CORE}.cmake)
4+
include(${MBED_PATH}/tools/cmake/cores/${MBED_CPU_CORE}.cmake)

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_ROOT}/tools/cmake/profiles/${LOWERCASE_CMAKE_BUILD_TYPE}.cmake)
32+
include(${MBED_PATH}/tools/cmake/profiles/${LOWERCASE_CMAKE_BUILD_TYPE}.cmake)

0 commit comments

Comments
 (0)