diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-11 14:58:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-11 14:58:37 (GMT) |
| commit | d1682a8514f9ecbe91f59e651be917afec044907 (patch) | |
| tree | c0c6569d2731ac9bad3dad41cfcd903f66b30b10 /Modules | |
| parent | 445ab80c444b1f5d2800784f85601976867df411 (diff) | |
| parent | 524f5ee186f95a0dc0dc449e437910a72b175893 (diff) | |
| download | CMake-d1682a8514f9ecbe91f59e651be917afec044907.zip CMake-d1682a8514f9ecbe91f59e651be917afec044907.tar.gz CMake-d1682a8514f9ecbe91f59e651be917afec044907.tar.bz2 | |
Merge topic 'android_clang_asm'
524f5ee1 Android: Set compiler target platform when compiling ASM with Clang
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Android-Clang-ASM.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Android-Clang.cmake | 4 |
2 files changed, 5 insertions, 1 deletions
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() |