mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 22:30:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'iar-align-output-extension'

Browse Source 
cfec4c1c5e IAR: Enforce output extension for xlink targets
7fec8f993b IAR: Replace extension for compiler and assembler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8477
This commit is contained in:
Brad King
2023-05-16 14:44:00 +00:00
committed by Kitware Robot
parent 76cc81f0fe cfec4c1c5e
commit 20c7219f8f
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Compiler/IAR-ASM.cmake
+4
View File
@@ -38,22 +38,26 @@ elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR")
__assembler_iar_deps("-y" 8)
set(_CMAKE_IAR_SILENCER_FLAG " -S")
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s90;asm;msa)
set(CMAKE_ASM_OUTPUT_EXTENSION ".r90")
elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "MSP430")
__compiler_iar_xlink(ASM)
__assembler_iar_deps("-y" 8)
set(_CMAKE_IAR_SILENCER_FLAG " -S")
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s43;asm;msa)
set(CMAKE_ASM_OUTPUT_EXTENSION ".r43")
elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "V850")
__compiler_iar_xlink(ASM)
set(_CMAKE_IAR_SILENCER_FLAG " -S")
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s85;asm;msa)
set(CMAKE_ASM_OUTPUT_EXTENSION ".r85")
elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "8051")
__compiler_iar_xlink(ASM)
set(_CMAKE_IAR_SILENCER_FLAG " -S")
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s51;asm;msa)
set(CMAKE_ASM_OUTPUT_EXTENSION ".r51")
elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "STM8")
__compiler_iar_ilink(ASM)
Modules/Compiler/IAR-CXX.cmake
+3 -2
View File
@@ -69,6 +69,7 @@ elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "RISCV")
elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR")
__compiler_iar_xlink(CXX)
__compiler_check_default_language_standard(CXX 7.10 98)
set(CMAKE_CXX_OUTPUT_EXTENSION ".r90")
elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "MSP430")
__compiler_iar_xlink(CXX)
@@ -78,12 +79,12 @@ elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "MSP430")
elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "V850")
__compiler_iar_xlink(CXX)
__compiler_check_default_language_standard(CXX 1.10 98)
set(CMAKE_C_OUTPUT_EXTENSION ".r85")
set(CMAKE_CXX_OUTPUT_EXTENSION ".r85")
elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "8051")
__compiler_iar_xlink(CXX)
__compiler_check_default_language_standard(CXX 6.10 98)
set(CMAKE_C_OUTPUT_EXTENSION ".r51")
set(CMAKE_CXX_OUTPUT_EXTENSION ".r51")
elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "STM8")
__compiler_iar_ilink(CXX)
Modules/Compiler/IAR.cmake
+1
View File
@@ -23,6 +23,7 @@ macro(__compiler_iar_common lang)
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -Oh -r -DNDEBUG")
endif()
set(CMAKE_${lang}_OUTPUT_EXTENSION_REPLACE 1)
set(CMAKE_${lang}_RESPONSE_FILE_FLAG "-f ")
set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "-f ")