diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-08-07 10:39:58 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-08-15 07:53:09 +0200 |
| commit | 8b45a0998c6f4cf28ebb51e816018a2a7416bdfd (patch) | |
| tree | 76478938bf51376161fb27d1746bb7576dec1f7e /src/core/configure.json | |
| parent | 7cade5688f6a0bde067dc496cedcb8de14662116 (diff) | |
Move xml2,glibc test to configure
Change-Id: I047f04a48d489730922093a9929e3609524dd06f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core/configure.json')
| -rw-r--r-- | src/core/configure.json | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index 345434090..b4d39696f 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -128,12 +128,6 @@ { "type": "pkgConfig", "args": "libevent" } ] }, - "webengine-libxml2": { - "label": "libxml2 and libxslt", - "sources": [ - { "type": "pkgConfig", "args": "libxml-2.0 libxslt" } - ] - }, "webengine-jsoncpp": { "label": "jsoncpp", "sources": [ @@ -216,6 +210,21 @@ "-ljpeg" ] }, + "webengine-libxml2": { + "label": "compatible libxml2 and libxslt", + "type": "compile", + "test": { + "tail": [ + "#if !defined(LIBXML_ICU_ENABLED)", + "#error libxml icu not enabled", + "#endif" + ] + }, + "headers": "libxml/xmlversion.h", + "sources": [ + { "type": "pkgConfig", "args": "libxml-2.0 libxslt" } + ] + }, "webengine-lcms2": { "label": "lcms2", "sources": [ @@ -321,12 +330,14 @@ "webengine-glibc": { "label": "glibc > 2.26", "type": "compile", - "test": "glibc" - }, - "webengine-libxml2-compatible": { - "label" : "compatible system libxml2", - "test" : "xml2", - "type": "compile" + "test": { + "include": "features.h", + "tail": [ + "#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 27", + "#error glibc versions below 2.27 are not supported", + "#endif" + ] + } }, "webengine-sanitizer": { "label" : "sanitizer support", @@ -636,9 +647,7 @@ }, "webengine-system-libxml2": { "label": "libxml2 and libxslt", - "condition": "config.unix - && libs.webengine-libxml2 - && tests.webengine-libxml2-compatible", + "condition": "config.unix && libs.webengine-libxml2", "output": [ "privateFeature" ] }, "webengine-system-lcms2" : { |