From 1080142ec35c2c739c7de3a0fa92c525b74c7da9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 3 Jun 2019 13:43:22 +0200 Subject: Fix Android build Do not set ANDROID_EMBEDDED unconditionally, as that for now is the least likely configuration and it won't compile when the sysroot is real Android. If this gets revived, then it can be done by setting ANDROID_EMBEDDED in the cache file directly via the cmake command line. Change-Id: Ic1e1731f981414bd90b89fe91eaf0543a87d8c88 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- cmake/QtPlatformSupport.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'cmake') diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake index 45479a3a7e..20feb1cc4a 100644 --- a/cmake/QtPlatformSupport.cmake +++ b/cmake/QtPlatformSupport.cmake @@ -28,8 +28,6 @@ set01(APPLE_IOS APPLE AND CMAKE_XCODE_PLATFORM_TOOLSET STREQUAL "ios") # FIXME: set01(APPLE_TVOS APPLE AND CMAKE_XCODE_PLATFORM_TOOLSET STREQUAL "tvos") # FIXME: How to identify this? set01(APPLE_WATCHOS APPLE AND CMAKE_XCODE_PLATFORM_TOOLSET STREQUAL "watchos") # FIXME: How to identify this? -set01(ANDROID_EMBEDDED ANDROID) # FIXME: How to identify this? - set01(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang") set01(ICC CMAKE_C_COMPILER MATCHES "icc|icl") -- cgit v1.2.3