mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'android_clang_asm'

Browse Source 
524f5ee1 Android: Set compiler target platform when compiling ASM with Clang
This commit is contained in:
Brad King
2017-01-11 09:58:37 -05:00
committed by CMake Topic Stage
parent 445ab80c44 524f5ee186
commit d1682a8514
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Platform/Android-Clang-ASM.cmake Normal file
View File

@@ -0,0 +1,2 @@
include(Platform/Android-Clang)
__android_compiler_clang(ASM)

4
Modules/Platform/Android-Clang.cmake
View File

@@ -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()