diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-28 10:40:47 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-28 15:48:17 +0200 |
| commit | 9bcabd71a7dc0a01f6a7bde9d9163db8b3f18cc4 (patch) | |
| tree | 8849c36171f699189b456a0106576f1112e41ece | |
| parent | a9f352cce3e0930303fad5fa7b664009585b5f3b (diff) | |
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>
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 | ||||
| -rw-r--r-- | configure.cmake | 2 | ||||
| -rw-r--r-- | configure.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 6bd5e76cd6..529b83ff73 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -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() diff --git a/configure.cmake b/configure.cmake index 97eb0c7aa7..1ee218646b 100644 --- a/configure.cmake +++ b/configure.cmake @@ -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 diff --git a/configure.json b/configure.json index 4b339cf2ae..29afbac43d 100644 --- a/configure.json +++ b/configure.json @@ -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", |