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 deefc1319b83543ff4ffe65feded4ddc290b6a54 (commit)
via 6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b (commit)
from 0287d41c435914431fee29ce064a480c5eb59174 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=deefc1319b83543ff4ffe65feded4ddc290b6a54
commit deefc1319b83543ff4ffe65feded4ddc290b6a54
Merge: 0287d41 6ad05df
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 13:53:13 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 13:53:13 2017 -0500
Merge topic 'android_clang_asm' into next
6ad05df8 Android: Set compiler target platform when compiling ASM with Clang
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b
commit 6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b
Author: Florent Castelli <florent.caste...@gmail.com>
AuthorDate: Fri Jan 6 23:33:37 2017 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 10 13:51:42 2017 -0500
Android: Set compiler target platform when compiling ASM with Clang
diff --git a/Modules/Platform/Android-Clang-ASM.cmake
b/Modules/Platform/Android-Clang-ASM.cmake
new file mode 100644
index 0000000..6448da6
--- /dev/null
+++ b/Modules/Platform/Android-Clang-ASM.cmake
@@ -0,0 +1,2 @@
+include(Platform/Android-Clang)
+__android_compiler_clang(ASM)
diff --git a/Modules/Platform/Android-Clang.cmake
b/Modules/Platform/Android-Clang.cmake
index f0cf4a5..f739ab1 100644
--- a/Modules/Platform/Android-Clang.cmake
+++ b/Modules/Platform/Android-Clang.cmake
@@ -35,7 +35,9 @@ include(Platform/Android-Common)
include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-Clang)
macro(__android_compiler_clang lang)
- __android_compiler_common(${lang})
+ if(NOT "x${lang}" STREQUAL "xASM")
+ __android_compiler_common(${lang})
+ endif()
if(NOT CMAKE_${lang}_COMPILER_TARGET)
set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}")
endif()
-----------------------------------------------------------------------
Summary of changes:
.../Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake} | 2 +-
Modules/Platform/Android-Clang.cmake | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
copy Modules/Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake} (51%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
