diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-14 15:15:38 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-14 10:15:55 -0500 |
| commit | 7e3389ce42b467f582fe1700791a919d9b6a6641 (patch) | |
| tree | 80fb3f3ae9f426cba31cc8a70379fc904b2e167f | |
| parent | d85f866baae609c91abc08b40cdccb28fd8c9f9c (diff) | |
| parent | f9ff6ab2d105e1a40b79ac93a70fe3658b2736f9 (diff) | |
| download | cmake-7e3389ce42b467f582fe1700791a919d9b6a6641.tar.gz | |
Merge topic 'iar-asm-archid' into release-3.25
f9ff6ab2d1 IAR: Fix ASM compiler architecture detection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7903
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index d03cbef010..5ec2972b0e 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -129,14 +129,13 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) if("x${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}" STREQUAL "xIAR") # primary necessary to detect architecture, so the right archiver and linker can be picked # eg. "IAR Assembler V8.10.1.12857/W32 for ARM" or "IAR Assembler V4.11.1.4666 for Renesas RX" - # Cut out identification first, newline handling is a pain + # Earlier versions did not provide `--version`, so grep the full output to extract Assembler ID string string(REGEX MATCH "IAR Assembler[^\r\n]*" _compileid "${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_OUTPUT}") if("${_compileid}" MATCHES "V([0-9]+\\.[0-9]+\\.[0-9]+)") set(CMAKE_ASM${ASM_DIALECT}_COMPILER_VERSION ${CMAKE_MATCH_1}) endif() - string(REGEX MATCHALL "([A-Za-z0-9-]+)" _all_compileid_matches "${_compileid}") - if(_all_compileid_matches) - list(GET _all_compileid_matches "-1" CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID) + if("${_compileid}" MATCHES "for.*(MSP430|8051|ARM|AVR|RH850|RISC-?V|RL78|RX|STM8|V850)") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID ${CMAKE_MATCH_1}) endif() elseif("x${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}" STREQUAL "xClang") # Test whether an MSVC-like command-line option works. |