diff options
| author | Florent Castelli <florent.castelli@gmail.com> | 2017-01-06 22:33:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-01-10 19:12:46 (GMT) |
| commit | 524f5ee186f95a0dc0dc449e437910a72b175893 (patch) | |
| tree | 51d66dee36c2db0b7ecba09e948e20f2209ddcb8 /Modules | |
| parent | c628fd2fab273999e959aad00834369924dd9d06 (diff) | |
| download | CMake-524f5ee186f95a0dc0dc449e437910a72b175893.zip CMake-524f5ee186f95a0dc0dc449e437910a72b175893.tar.gz CMake-524f5ee186f95a0dc0dc449e437910a72b175893.tar.bz2 | |
Android: Set compiler target platform when compiling ASM with Clang
Closes: #16535
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() |