diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:38:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:38:51 (GMT) |
| commit | 2582994e57004d02f5609f9d5c2c57071140fdf8 (patch) | |
| tree | 3c2c530579ce2db3af316b30f9c701753e799d75 | |
| parent | 3574bb484209f3becbb78d1cd3a97ed480d361e2 (diff) | |
| parent | 7e8471ce7bc6ea2537c9bf513935dfe1e4424c5e (diff) | |
| download | CMake-2582994e57004d02f5609f9d5c2c57071140fdf8.zip CMake-2582994e57004d02f5609f9d5c2c57071140fdf8.tar.gz CMake-2582994e57004d02f5609f9d5c2c57071140fdf8.tar.bz2 | |
Merge topic 'clang-asm'
7e8471c Recognize Clang ASM support (#13473)
| -rw-r--r-- | Modules/Compiler/Clang-ASM.cmake | 1 | ||||
| -rw-r--r-- | Tests/Assembler/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Modules/Compiler/Clang-ASM.cmake b/Modules/Compiler/Clang-ASM.cmake new file mode 100644 index 0000000..a908b60 --- /dev/null +++ b/Modules/Compiler/Clang-ASM.cmake @@ -0,0 +1 @@ +include(Compiler/GNU-ASM) diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt index 5f71036..415fcce 100644 --- a/Tests/Assembler/CMakeLists.txt +++ b/Tests/Assembler/CMakeLists.txt @@ -8,7 +8,7 @@ set(SRCS) # (at least) the following toolchains can process assembler files directly # and also generate assembler files from C: if("${CMAKE_GENERATOR}" MATCHES "Makefile") - if(("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|HP|SunPro|XL)$") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel" AND UNIX)) + if(("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|Clang|HP|SunPro|XL)$") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel" AND UNIX)) set(C_FLAGS "${CMAKE_C_FLAGS}") separate_arguments(C_FLAGS) set(SRCS main.s) |