Skip to content

Commit c25e5f5

Browse files
committed
CMake: move toolchain to the top
First toolchain set-up, includes from Mbed OS then library set up.
1 parent 972a511 commit c25e5f5

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

CMakeLists.txt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,32 @@
55

66
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
77

8-
98
# Using relative paths behavior
109
if(POLICY CMP0076)
1110
cmake_policy(SET CMP0076 NEW)
1211
endif()
1312

14-
# Create Mbed OS library
15-
add_library(mbed-os OBJECT)
16-
17-
include(${MBED_ROOT}/cmake/util.cmake)
18-
1913
include(${MBED_CONFIG_PATH}/mbed_config.cmake)
2014

21-
include(${MBED_ROOT}/cmake/core.cmake)
22-
mbed_set_cpu_core_options(mbed-os ${MBED_TOOLCHAIN})
23-
2415
# Set default toolchain file
2516
if(NOT CMAKE_TOOLCHAIN_FILE)
2617
set(CMAKE_TOOLCHAIN_FILE "${MBED_ROOT}/cmake/toolchain.cmake" CACHE INTERNAL "")
2718
endif()
2819

20+
# Toolchain setup
2921
include(${MBED_ROOT}/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)
3022
enable_language(C CXX ASM)
31-
mbed_set_toolchain_options(mbed-os)
32-
mbed_set_language_standard(mbed-os)
3323

24+
include(${MBED_ROOT}/cmake/core.cmake)
25+
include(${MBED_ROOT}/cmake/util.cmake)
3426
include(${MBED_ROOT}/cmake/profile.cmake)
27+
28+
# Create Mbed OS library
29+
add_library(mbed-os OBJECT)
30+
31+
mbed_set_cpu_core_options(mbed-os ${MBED_TOOLCHAIN})
32+
mbed_set_toolchain_options(mbed-os)
33+
mbed_set_language_standard(mbed-os)
3534
mbed_set_profile_options(mbed-os ${MBED_TOOLCHAIN})
3635

3736
set_target_properties(mbed-os

0 commit comments

Comments
 (0)