diff options
author | Brad King <brad.king@kitware.com> | 2018-11-09 16:45:30 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-11-09 16:45:30 (GMT) |
commit | 51bf23ed74bdebc7a98880cd13af8c5f37ab02ba (patch) | |
tree | 8a1569d4989ee0ff0aef6fcdec0e452450bac1f1 /Modules | |
parent | cda0b14ec32ad3d3aa67dd12d75aa34ffb1bcd19 (diff) | |
parent | c84fb4812d99978c2608379825b78fe43cda8659 (diff) | |
download | CMake-51bf23ed74bdebc7a98880cd13af8c5f37ab02ba.zip CMake-51bf23ed74bdebc7a98880cd13af8c5f37ab02ba.tar.gz CMake-51bf23ed74bdebc7a98880cd13af8c5f37ab02ba.tar.bz2 |
Merge branch 'asm-compiler-id-clang' into release-3.13
Merge-request: !2584
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index 45dea8f..dbc41c8 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -58,6 +58,14 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_GNU "--version") set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "(GNU assembler)|(GCC)|(Free Software Foundation)") + list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS Clang ) + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_Clang "--version") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_Clang "(clang version)") + + list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS AppleClang ) + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_AppleClang "--version") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_AppleClang "(Apple LLVM version)") + list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS HP ) set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_HP "-V") set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_HP "HP C") |