aboutsummaryrefslogtreecommitdiff
path: root/cmsis.cmake
diff options
context:
space:
mode:
authorKristofer Jonsson <kristofer.jonsson@arm.com>2021-02-16 17:40:25 +0100
committerKristofer Jonsson <kristofer.jonsson@arm.com>2021-02-23 16:56:46 +0100
commit1efcc3f957e7f64dc8b2b9d7061c0ef7050466cd (patch)
treeeb69ec43d2cfff09b91fbc558afcbe7431a91b80 /cmsis.cmake
parentff1d14d47775de61af735b2689476892320fddab (diff)
downloadethos-u-core-software-1efcc3f957e7f64dc8b2b9d7061c0ef7050466cd.tar.gz
Assembly support
Update the Arm Clang toolchain file to support assembly files. Removing cmsis_core dependency. Applications that depend on CMSIS should add that dependency manually. Change-Id: I42d68e6734acc88aef8f9af124b5e76079b839b5
Diffstat (limited to 'cmsis.cmake')
-rw-r--r--cmsis.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/cmsis.cmake b/cmsis.cmake
index b5b6726..fd93545 100644
--- a/cmsis.cmake
+++ b/cmsis.cmake
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -44,7 +44,9 @@ target_include_directories(cmsis_core INTERFACE ${CMSIS_PATH}/CMSIS/Core/Include
add_library(cmsis_device INTERFACE)
target_include_directories(cmsis_device INTERFACE ${CMSIS_PATH}/Device/ARM/${ARM_CPU}/Include)
-target_compile_options(cmsis_device INTERFACE -include${ARM_CPU}${ARM_FEATURES}.h)
+target_compile_options(cmsis_device INTERFACE
+ "$<$<COMPILE_LANGUAGE:C>:-include${ARM_CPU}${ARM_FEATURES}.h>"
+ "$<$<COMPILE_LANGUAGE:CXX>:-include${ARM_CPU}${ARM_FEATURES}.h>")
target_link_libraries(cmsis_device INTERFACE cmsis_core)
# CMSIS startup