[Cmake-commits] CMake branch, next, updated. v2.8.9-79-g22590d2
Brad King
brad.king at kitware.com
Wed Aug 15 09:41:04 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 22590d2d624ae0f3d41c3384377e0318d12073ff (commit)
via 7e8471ce7bc6ea2537c9bf513935dfe1e4424c5e (commit)
via addefc2ae3b33a75a7152730146b46b319118a24 (commit)
from bf71b7dd65fcab84e1a22632d106c81dd272fee3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22590d2d624ae0f3d41c3384377e0318d12073ff
commit 22590d2d624ae0f3d41c3384377e0318d12073ff
Merge: bf71b7d 7e8471c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 15 09:41:00 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 15 09:41:00 2012 -0400
Merge topic 'clang-asm' into next
7e8471c Recognize Clang ASM support (#13473)
addefc2 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e8471ce7bc6ea2537c9bf513935dfe1e4424c5e
commit 7e8471ce7bc6ea2537c9bf513935dfe1e4424c5e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 15 09:36:05 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 15 09:40:20 2012 -0400
Recognize Clang ASM support (#13473)
Since commit 571dc748 (Recognize Clang C and C++ compilers, 2010-05-17)
we recognize Clang C and C++ support. Add Compiler/Clang-ASM.cmake to
enable use of Clang for ASM too. Also teach Assembler test to try Clang
as an assembler.
Suggested-by: Tobias Pape <tobiaspape at gmail.com>
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Clang-ASM.cmake | 1 +
Source/CMakeVersion.cmake | 2 +-
Tests/Assembler/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 Modules/Compiler/Clang-ASM.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list