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:14 (GMT) |
| commit | 4b8126fa409e8558f465c70eaa794dab82819d8d (patch) | |
| tree | 2d247f38efec8815bd6688515692da8140f96902 | |
| parent | b00388a7e72389234b1bf203823dea5f0f33b559 (diff) | |
| parent | c2777ed00854ce692e4bc83f5c4f5774efd9cd65 (diff) | |
| download | CMake-4b8126fa409e8558f465c70eaa794dab82819d8d.zip CMake-4b8126fa409e8558f465c70eaa794dab82819d8d.tar.gz CMake-4b8126fa409e8558f465c70eaa794dab82819d8d.tar.bz2 | |
Merge topic 'armasm-6.17' into release-3.22
c2777ed008 ASM: Fix identification of armasm 6.17+
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6833
| -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") |