From f1c37ead59cff4ce5788c75a9183f327c0681480 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 22 Apr 2021 15:52:55 +0200 Subject: [PATCH] Error out if requesting Android build without toolchain file Passing Android-related variables to the initial CMake call would have no effect if no (or an empty) value of CMAKE_TOOLCHAIN_FILE was specified. To alleviate user confusion, yield an error if an Android build was apparantly requested, but the toolchain file is missing. Change-Id: I28ec94eabe436d4b9b410b48c7cad1b48d3e1bec Reviewed-by: Alexandru Croitor --- cmake/QtAutoDetect.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 706ffe6aea6..0337637216e 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -144,6 +144,12 @@ function(qt_auto_detect_android) endif() endif() + if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "" + AND (DEFINED ANDROID_ABI OR DEFINED ANDROID_NATIVE_API_LEVEL)) + message(FATAL_ERROR "An Android build was requested, but no Android toolchain file was " + "specified nor detected.") + endif() + if(DEFINED CMAKE_TOOLCHAIN_FILE AND NOT DEFINED QT_AUTODETECT_ANDROID) qt_auto_detect_read_toolchain_file(tcf VARIABLES CMAKE_SYSTEM_NAME) if(tcf_CMAKE_SYSTEM_NAME STREQUAL "Android")