commit af19ae94ac7acb4c4cac06138eafac221d0ddb2a
author TTornblom <thomas.tornblom@iar.com> Tue Sep 29 13:26:29 2020 +0200
committer Tamas Ban <tamas.ban@arm.com> Thu Oct 29 10:08:44 2020 +0000
tree 067e9b15757a150007defbfa139a154ba53a0ae0
parent 539db732035cf9325cdbf79bdbd5164f45341fbc

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

toolchain_IARARM.cmake

diff --git a/toolchain_IARARM.cmake b/toolchain_IARARM.cmake
index 1d58f0f..b08a28e 100644
--- a/toolchain_IARARM.cmake
+++ b/toolchain_IARARM.cmake
@@ -103,7 +103,6 @@
     target_link_options(${target}
         PRIVATE
         --config $<TARGET_OBJECTS:${target}_scatter>
-        --map $<TARGET_FILE:${target}>.map
     )
     add_dependencies(${target}
         ${target}_scatter
@@ -119,17 +118,13 @@
         # set_source_file_properties command, so instead we just parse the regex
         # for the filename and set the property on all files, regardless of if
         # the generator expression would evaluate to true or not.
-        string(REGEX REPLACE ".*:(.*)>$" "\\1" SCATTER_FILE_PATH ${scatter_file})
+        string(REGEX REPLACE ".*>:(.*)>$" "\\1" SCATTER_FILE_PATH "${scatter_file}")
         set_source_files_properties(${SCATTER_FILE_PATH}
             PROPERTIES
             LANGUAGE C
         )
     endforeach()
 
-    set_target_properties(${target}_scatter PROPERTIES
-        SUFFIX ".icf"
-    )
-
     target_link_libraries(${target}_scatter
         platform_region_defs
         psa_interface