[Cmake-commits] CMake branch, next, updated. v3.7.1-1986-g202c24a

[Brad King]

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  202c24a3e137558723f8d781ccbdd3665daa8b2e (commit)
       via  524f5ee186f95a0dc0dc449e437910a72b175893 (commit)
      from  b4636f780f83e0da8431a5cfd6725878baf65aab (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=202c24a3e137558723f8d781ccbdd3665daa8b2e
commit 202c24a3e137558723f8d781ccbdd3665daa8b2e
Merge: b4636f7 524f5ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 14:13:34 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 14:13:34 2017 -0500

    Merge topic 'android_clang_asm' into next
    
    524f5ee1 Android: Set compiler target platform when compiling ASM with Clang


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=524f5ee186f95a0dc0dc449e437910a72b175893
commit 524f5ee186f95a0dc0dc449e437910a72b175893
Author:     Florent Castelli <florent.castelli at gmail.com>
AuthorDate: Fri Jan 6 23:33:37 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 14:12:46 2017 -0500

    Android: Set compiler target platform when compiling ASM with Clang
    
    Closes: #16535

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:


hooks/post-receive
-- 
CMake