Skip to content

Commit 870b637

Browse files
committed
CMake: add mbed_ prefix to our CMake files
To avoid conflicts as we expose our CMake list files via CMAKE_MODULE_PATH. Some files already include it, this aligns the rest of files. I leave app.cmake as it is - it's user facing and it would be breaking change. We can clean this one for the next major version.
1 parent 2674de3 commit 870b637

File tree

6 files changed

+5
-4
lines changed

6 files changed

+5
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
77

88
include(${MBED_CONFIG_PATH}/mbed_config.cmake)
9-
include(tools/cmake/set_linker_script.cmake)
9+
include(mbed_set_linker_script)
1010

1111
project(mbed-os)
1212

targets/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
3-
include(../tools/cmake/set_linker_script.cmake)
3+
4+
include(mbed_set_linker_script)
45

56
add_subdirectory(TARGET_Ambiq_Micro EXCLUDE_FROM_ALL)
67
add_subdirectory(TARGET_Analog_Devices EXCLUDE_FROM_ALL)

tools/cmake/app.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ include(${MBED_CONFIG_PATH}/mbed_config.cmake)
1515
# Load toolchain file
1616
if(NOT CMAKE_TOOLCHAIN_FILE OR MBED_TOOLCHAIN_FILE_USED)
1717
set(MBED_TOOLCHAIN_FILE_USED TRUE CACHE INTERNAL "")
18-
include(toolchain)
18+
include(mbed_toolchain)
1919
endif()
2020

2121
# Specify available build profiles and add options for the selected build profile
22-
include(profile)
22+
include(mbed_profile)
2323

2424
enable_language(C CXX ASM)
2525

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)