CMake: Rename Mbed OS path variable for consistency

Rename the CMake variable expected from applications from MBED_ROOT to
MBED_PATH to be consistent with the naming used for the configuration file
(MBED_CONFIG_PATH) also expected from applications.
pull/13566/head
Hugues Kamba 2020-11-05 12:22:34 +00:00
parent 76cf2f7232
commit e80fa8b715
5 changed files with 8 additions and 8 deletions

View File

@ -10,8 +10,8 @@ if(POLICY CMP0076)
cmake_policy(SET CMP0076 NEW)
endif()
include(${MBED_ROOT}/tools/cmake/core.cmake)
include(${MBED_ROOT}/tools/cmake/profile.cmake)
include(${MBED_PATH}/tools/cmake/core.cmake)
include(${MBED_PATH}/tools/cmake/profile.cmake)
add_library(mbed-core INTERFACE)
@ -185,7 +185,7 @@ function(mbed_generate_map_file target)
TARGET
${target}
POST_BUILD
COMMAND ${Python3_EXECUTABLE} ${MBED_ROOT}/tools/memap.py -t ${MBED_TOOLCHAIN} -d 4 ${CMAKE_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
COMMAND ${Python3_EXECUTABLE} ${MBED_PATH}/tools/memap.py -t ${MBED_TOOLCHAIN} -d 4 ${CMAKE_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
WORKING_DIRECTORY
${CMAKE_BINARY_DIR}
COMMENT

View File

@ -46,7 +46,7 @@ The next sections will describe static CMake files within Mbed OS Core repositor
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`.
This is not intended to be included by an application. Applications must use `add_subdirectory(${MBED_ROOT})`.
This is not intended to be included by an application. Applications must use `add_subdirectory(${MBED_PATH})`.
### 2. Toolchain CMake Scripts

View File

@ -11,9 +11,9 @@ include(${MBED_CONFIG_PATH}/mbed_config.cmake)
# Set default toolchain file
if(NOT CMAKE_TOOLCHAIN_FILE)
set(CMAKE_TOOLCHAIN_FILE "${MBED_ROOT}/tools/cmake/toolchain.cmake" CACHE INTERNAL "")
set(CMAKE_TOOLCHAIN_FILE "${MBED_PATH}/tools/cmake/toolchain.cmake" CACHE INTERNAL "")
endif()
# Toolchain setup
include(${MBED_ROOT}/tools/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)
include(${MBED_PATH}/tools/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)
enable_language(C CXX ASM)

View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
include(${MBED_ROOT}/tools/cmake/cores/${MBED_CPU_CORE}.cmake)
include(${MBED_PATH}/tools/cmake/cores/${MBED_CPU_CORE}.cmake)

View File

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