summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-09-28 10:40:47 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-09-28 15:48:17 +0200
commit9bcabd71a7dc0a01f6a7bde9d9163db8b3f18cc4 (patch)
tree8849c36171f699189b456a0106576f1112e41ece /configure.json
parenta9f352cce3e0930303fad5fa7b664009585b5f3b (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>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json2
1 files changed, 1 insertions, 1 deletions
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",