diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-08-07 18:17:07 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-08-15 07:58:46 +0200 |
| commit | 113f866f4d0d60f11de0aa6cb19b5e20e64695d9 (patch) | |
| tree | 3868ad806f3636025ad6909eb27dd50d93852714 /src/core/configure.json | |
| parent | f45e938472f64e9bf2d38a2000e9e93db52016d9 (diff) | |
Move re2 test to configure
Change-Id: I76aa5c544a5930982e1d1b0ed28a75e88ec65e48
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/configure.json')
| -rw-r--r-- | src/core/configure.json | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index 7ec1b0714..14211a2f1 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -146,12 +146,25 @@ { "type": "pkgConfig", "args": "poppler-cpp" } ] }, - "pulseaudio": { + "webengine-pulseaudio": { "label": "pulseaudio >= 0.9.10", "sources": [ { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" } ] }, + "webengine-re2": { + "label": "re2", + "test" : { + "main": [ + "std::string s;", + "RE2 re2(s);" + ] + }, + "headers": "re2/re2.h", + "sources": [ + { "type": "pkgConfig", "args": "re2" } + ] + }, "webengine-icu": { "label": "icu >= 63", "sources": [ @@ -346,11 +359,6 @@ "label": "embedded", "type": "embedded" }, - "webengine-re2": { - "label": "re2", - "test": "re2", - "type": "compile" - }, "webengine-glibc": { "label": "glibc > 2.26", "type": "compile", @@ -550,7 +558,7 @@ "webengine-pulseaudio": { "label": "Use PulseAudio", "autoDetect": "config.unix", - "condition": "libs.pulseaudio", + "condition": "libs.webengine-pulseaudio", "output": [ "privateFeature" ] }, "webengine-pepper-plugins": { @@ -650,7 +658,7 @@ "webengine-system-re2": { "label": "re2", "autoDetect": "config.unix", - "condition": "tests.webengine-re2", + "condition": "libs.webengine-re2", "output": [ "privateFeature" ] }, "webengine-system-ninja": { |