summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-09-01 12:21:57 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-09-03 13:04:57 +0000
commitd3364371411d4c9ee53d9d1d378e6bbd68946c0d (patch)
treef319de86ed113d8264f0cf4395caee0104e86882 /configure.json
parent38f816a443a384aaaacc932de99bfdf30bcc469f (diff)
Add detection for system re2
Change-Id: Ifa305045f3594f06b0ee106cd43f9d35853f8958 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json12
1 files changed, 12 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index e82247ec5..6aab3f3c9 100644
--- a/configure.json
+++ b/configure.json
@@ -78,6 +78,11 @@
"embedded": {
"label": "embedded",
"type": "embedded"
+ },
+ "re2": {
+ "label": "re2",
+ "test": "re2",
+ "type": "compile"
}
},
@@ -167,6 +172,12 @@
"condition": "libs.icu",
"output": [ "privateFeature" ]
},
+ "system-re2": {
+ "label": "re2",
+ "autoDetect": "config.unix",
+ "condition": "tests.re2",
+ "output": [ "privateFeature" ]
+ },
"system-ninja": {
"label": "Using system ninja",
"condition": "tests.ninja",
@@ -213,6 +224,7 @@
"section": "System libraries",
"condition": "config.unix",
"entries": [
+ "system-re2",
"system-icu",
"system-webp",
"system-opus",