From 66f49d1f9ae46d928df0509e96215cdd28db4dcb Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 5 Oct 2018 10:21:40 -0400 Subject: Android: Add clang --target= flag to compiler predefines command When we set `CMAKE__COMPILER_TARGET` to the Android target architecture, add it to `CMAKE__COMPILER_PREDEFINES_COMMAND` also. This is needed to make moc predefines aware of `__ANDROID__`. Fixes: #18425 --- Modules/Platform/Android-Clang.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake index f739ab1..9ed1e01 100644 --- a/Modules/Platform/Android-Clang.cmake +++ b/Modules/Platform/Android-Clang.cmake @@ -40,5 +40,6 @@ macro(__android_compiler_clang lang) endif() if(NOT CMAKE_${lang}_COMPILER_TARGET) set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}") + list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "--target=${CMAKE_${lang}_COMPILER_TARGET}") endif() endmacro() -- cgit v0.12