Skip to content

Commit 10f4212

Browse files
urutvahugueskamba
authored andcommitted
cmake: Using Arm compiler from Mbed Studio
Added a command line option `-DMBEDIDE=ON` which allows using Arm compiler shipped with Mbed Studio on local machines. Signed-off-by: Devaraj Ranganna <devaraj.ranganna@arm.com>
1 parent f18622e commit 10f4212

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

cmake/app.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
6464
)
6565
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
6666
set(CMAKE_POST_BUILD_COMMAND
67-
COMMAND ${ELF2BIN} --bin -o $<TARGET_FILE:app>.bin $<TARGET_FILE:app>
67+
COMMAND ${ELF2BIN} ${MBED_STUDIO_ARM_COMPILER} --bin -o $<TARGET_FILE:app>.bin $<TARGET_FILE:app>
6868
COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.bin"
69-
COMMAND ${ELF2BIN} --i32combined -o $<TARGET_FILE:app>.hex $<TARGET_FILE:app>
69+
COMMAND ${ELF2BIN} ${MBED_STUDIO_ARM_COMPILER} --i32combined -o $<TARGET_FILE:app>.hex $<TARGET_FILE:app>
7070
COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.hex"
7171
)
7272
elseif(MBED_TOOLCHAIN STREQUAL "IAR")

cmake/toolchain.cmake

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

4+
option(MBEDIDE "Use Arm compiler from Mbed Studio" OFF)
5+
if(MBEDIDE)
6+
set(MBED_STUDIO_ARM_COMPILER "--ide=mbed")
7+
endif()
48
include(${MBED_ROOT}/cmake/toolchains/${MBED_TOOLCHAIN}.cmake)

cmake/toolchains/ARM.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(CMAKE_CXX_COMPILER "armclang")
77
set(CMAKE_AR "armar")
88
set(ELF2BIN "fromelf")
99
set(COMMON_FLAGS " \
10+
${MBED_STUDIO_ARM_COMPILER} \
1011
-c \
1112
--target=arm-arm-none-eabi \
1213
-Oz \
@@ -26,9 +27,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
2627
${COMMON_FLAGS} \
2728
")
2829
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
30+
${MBED_STUDIO_ARM_COMPILER} \
2931
--cpreproc \
3032
--cpreproc_opts=--target=arm-arm-none-eabi,-mcpu=cortex-m4,-D,__FPU_PRESENT,-D,MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED \
3133
")
34+
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
35+
${MBED_STUDIO_ARM_COMPILER} \
36+
")
3237

3338
add_definitions(
3439
-DTOOLCHAIN_ARM

0 commit comments

Comments
 (0)