By default don't try to use pkg-config when targeting Android

It causes issues in our Windows CI, because the strawberry perl
pkg-config is found. And even that one is unusable, due to a bug in
CMake which is tracked at
https://gitlab.kitware.com/cmake/cmake/-/issues/21239

Change-Id: I58816195d35459e8a44c923399c35a4956c222a2
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
This commit is contained in:
Alexandru Croitor 2020-09-28 10:40:47 +02:00
parent a9f352cce3
commit 9bcabd71a7
3 changed files with 3 additions and 3 deletions

View File

@ -72,7 +72,7 @@ function(qt_build_internals_disable_pkg_config_if_needed)
set(pkg_config_enabled ON)
qt_build_internals_find_pkg_config_executable()
if(APPLE OR WIN32 OR QNX OR (NOT PKG_CONFIG_EXECUTABLE))
if(APPLE OR WIN32 OR QNX OR ANDROID OR (NOT PKG_CONFIG_EXECUTABLE))
set(pkg_config_enabled OFF)
endif()

View File

@ -433,7 +433,7 @@ qt_feature("optimize_size"
qt_feature_config("optimize_size" QMAKE_PRIVATE_CONFIG)
qt_feature("pkg-config" PUBLIC
LABEL "Using pkg-config"
AUTODETECT NOT APPLE AND NOT WIN32
AUTODETECT NOT APPLE AND NOT WIN32 AND NOT ANDROID
CONDITION PKG_CONFIG_FOUND
)
qt_feature_config("pkg-config" QMAKE_PUBLIC_QT_CONFIG

View File

@ -753,7 +753,7 @@
},
"pkg-config": {
"label": "Using pkg-config",
"autoDetect": "!config.darwin && !config.win32",
"autoDetect": "!config.darwin && !config.win32 && !config.android",
"condition": "tests.pkg-config",
"output": [
"publicFeature",