@@ -72,7 +72,7 @@ set(WARNING_FLAGS_GNU
7272 -Wredundant-decls
7373 )
7474
75- set (WARNINGS_FLAGS_IAR "" )
75+ set (WARNING_FLAGS_IAR "" )
7676
7777
7878# Filter example based on only.txt and skip.txt
@@ -191,10 +191,12 @@ function(family_configure_common TARGET RTOS)
191191 )
192192
193193 # run size after build
194- add_custom_command (TARGET ${TARGET} POST_BUILD
195- COMMAND ${CMAKE_SIZE} $<TARGET_FILE:${TARGET} >
196- )
197-
194+ find_program (SIZE_EXE ${CMAKE_SIZE} )
195+ if (NOT ${SIZE_EXE} STREQUAL SIZE_EXE-NOTFOUND )
196+ add_custom_command (TARGET ${TARGET} POST_BUILD
197+ COMMAND ${SIZE_EXE} $<TARGET_FILE:${TARGET} >
198+ )
199+ endif ()
198200 # Add warnings flags
199201 target_compile_options (${TARGET} PUBLIC ${WARNING_FLAGS_${CMAKE_C_COMPILER_ID} })
200202
@@ -205,6 +207,10 @@ function(family_configure_common TARGET RTOS)
205207 target_link_options (${TARGET} PUBLIC "LINKER:--no-warn-rwx-segments" )
206208 endif ()
207209 endif ()
210+ if (CMAKE_C_COMPILER_ID STREQUAL "IAR" )
211+ target_link_options (${TARGET} PUBLIC "LINKER:--map=$<TARGET_FILE:${TARGET} >.map" )
212+ endif ()
213+
208214
209215 # ETM Trace option
210216 if (TRACE_ETM STREQUAL "1" )
@@ -367,7 +373,7 @@ function(family_flash_jlink TARGET)
367373 endif ()
368374
369375 file (GENERATE
370- OUTPUT ${CMAKE_CURRENT_BINARY_DIR} /${TARGET} .jlink
376+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR} /$<CONFIG>/ $ {TARGET} .jlink
371377 CONTENT "halt
372378loadfile $<TARGET_FILE:${TARGET} >
373379r
@@ -377,7 +383,7 @@ exit"
377383
378384 add_custom_target (${TARGET} -jlink
379385 DEPENDS ${TARGET}
380- COMMAND ${JLINKEXE} -device ${JLINK_DEVICE} -if swd -JTAGConf -1,-1 -speed auto -CommandFile ${CMAKE_CURRENT_BINARY_DIR} /${TARGET} .jlink
386+ COMMAND ${JLINKEXE} -device ${JLINK_DEVICE} -if swd -JTAGConf -1,-1 -speed auto -CommandFile ${CMAKE_CURRENT_BINARY_DIR} /$<CONFIG>/ $ {TARGET} .jlink
381387 )
382388endfunction ()
383389
0 commit comments