diff options
| author | Brad King <brad.king@kitware.com> | 2022-01-07 14:40:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-01-07 14:40:15 (GMT) |
| commit | 46b34407cb0e7454f8bf8c279fafe6fa033ab421 (patch) | |
| tree | 23e82be6e45d0af364dd8fc38ea7767f5ae97e54 /Modules | |
| parent | 229455307065f3d438928d6a7a5059f5a2337bf6 (diff) | |
| parent | c2777ed00854ce692e4bc83f5c4f5774efd9cd65 (diff) | |
| download | CMake-46b34407cb0e7454f8bf8c279fafe6fa033ab421.zip CMake-46b34407cb0e7454f8bf8c279fafe6fa033ab421.tar.gz CMake-46b34407cb0e7454f8bf8c279fafe6fa033ab421.tar.bz2 | |
Merge topic 'armasm-6.17'
c2777ed008 ASM: Fix identification of armasm 6.17+
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6833
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index a1814b7..d03cbef 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -104,7 +104,7 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS ARMCC) set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_ARMCC ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_ARMCC "(ARM Compiler)|(ARM Assembler)") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_ARMCC "(ARM Compiler)|(ARM Assembler)|(Arm Compiler)") list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS NASM) set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_NASM "-v") |