aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTTornblom <thomas.tornblom@iar.com>2020-09-29 13:26:29 +0200
committerTamas Ban <tamas.ban@arm.com>2020-10-29 10:08:44 +0000
commitaf19ae94ac7acb4c4cac06138eafac221d0ddb2a (patch)
tree067e9b15757a150007defbfa139a154ba53a0ae0 /lib
parent539db732035cf9325cdbf79bdbd5164f45341fbc (diff)
downloadtrusted-firmware-m-af19ae94ac7acb4c4cac06138eafac221d0ddb2a.tar.gz
Build: Update IAR cmake files, fix Windows build errors
Fixed regex issue in toolchain_IARARM.cmake, causing Windows build errors Moved --map option from toolchain file to CMakeLists.txt files, like for ARMClang and GNUARM Removed dead code from toolchain_IARARM.cmake Renamed IAR RTX libraries in CMakeLists.txt Signed-off-by: TTornblom <thomas.tornblom@iar.com> Change-Id: I01805f59a5be0ca4cd2bf47f20dd4a8852c1ea54
Diffstat (limited to 'lib')
-rw-r--r--lib/ext/CMSIS_5/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ext/CMSIS_5/CMakeLists.txt b/lib/ext/CMSIS_5/CMakeLists.txt
index 6c5167d7e..818b09dfc 100644
--- a/lib/ext/CMSIS_5/CMakeLists.txt
+++ b/lib/ext/CMSIS_5/CMakeLists.txt
@@ -18,9 +18,9 @@ elseif("${CMAKE_C_COMPILER_ID}" STREQUAL ARMClang)
set_target_properties(CMSIS_5_RTX_V8MBN PROPERTIES IMPORTED_LOCATION ${CMSIS_5_PATH}/RTOS2/RTX/Library/ARM/RTX_V8MBN.lib)
set_target_properties(CMSIS_5_RTX_CM3 PROPERTIES IMPORTED_LOCATION ${CMSIS_5_PATH}/RTOS2/RTX/Library/ARM/RTX_CM3.lib)
elseif("${CMAKE_C_COMPILER_ID}" STREQUAL IAR)
- set_target_properties(CMSIS_5_RTX_V8MMN PROPERTIES IMPORTED_LOCATION ${CMSIS_5_PATH}/RTOS2/RTX/Library/IAR/libRTX_V8MMN.a)
- set_target_properties(CMSIS_5_RTX_V8MBN PROPERTIES IMPORTED_LOCATION ${CMSIS_5_PATH}/RTOS2/RTX/Library/IAR/libRTX_V8MBN.a)
- set_target_properties(CMSIS_5_RTX_CM3 PROPERTIES IMPORTED_LOCATION ${CMSIS_5_PATH}/RTOS2/RTX/Library/IAR/libRTX_CM3.a)
+ set_target_properties(CMSIS_5_RTX_V8MMN PROPERTIES IMPORTED_LOCATION ${CMSIS_5_PATH}/RTOS2/RTX/Library/IAR/RTX_V8MMN.a)
+ set_target_properties(CMSIS_5_RTX_V8MBN PROPERTIES IMPORTED_LOCATION ${CMSIS_5_PATH}/RTOS2/RTX/Library/IAR/RTX_V8MBN.a)
+ set_target_properties(CMSIS_5_RTX_CM3 PROPERTIES IMPORTED_LOCATION ${CMSIS_5_PATH}/RTOS2/RTX/Library/IAR/RTX_CM3.a)
else()
message(FATAL_ERROR "${CMAKE_C_COMPILER_ID} does not have CMSIS RTX static libraries set up")
endif()