diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-12-07 19:31:17 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-07-16 15:46:00 +0000 |
| commit | 05d49415eaed73fa35525c86642288f621a7111e (patch) | |
| tree | c4c76f6cfe59f1ef44de085a32319d7cda852cab /src/gui/configure.json | |
| parent | 6b4f2f755671843e794b15ef795524816b9ffc4a (diff) | |
configure: group tests' includes properly
this puts the actually relevant includes into the correct field, which
potentially allows early header resolution, and is generally just
cleaner.
Change-Id: I9db870442d22a329441eafe53098d18cdc91ce16
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 55 |
1 files changed, 36 insertions, 19 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 04e42fc247..506caf6794 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -114,11 +114,16 @@ "drm": { "label": "KMS", "test": { - "include": [ "stdlib.h", "stdint.h" ], + "head": [ + "#include <stdlib.h>", + "#include <stdint.h>", + "extern \"C\" {" + ], + "include": [ + "xf86drmMode.h", + "xf86drm.h" + ], "tail": [ - "extern \"C\" {", - "#include <xf86drmMode.h>", - "#include <xf86drm.h>", "}" ], "main": "(void) drmModeGetCrtc(0, 0);" @@ -146,8 +151,8 @@ "freetype": { "label": "FreeType", "test": { - "head": [ - "#include <ft2build.h>", + "include": "ft2build.h", + "tail": [ "#include FT_FREETYPE_H", "#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20200)", "# error This version of freetype is too old.", @@ -165,8 +170,8 @@ "fontconfig": { "label": "Fontconfig", "test": { - "head": [ - "#include <fontconfig/fontconfig.h>", + "include": "fontconfig/fontconfig.h", + "tail": [ "#ifndef FC_RGBA_UNKNOWN", "# error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define", "#endif" @@ -184,10 +189,13 @@ "gbm": { "label": "GBM", "test": { - "include": [ "stdlib.h", "stdint.h" ], + "head": [ + "#include <stdlib.h>", + "#include <stdint.h>", + "extern \"C\" {" + ], + "include": "gbm.h", "tail": [ - "extern \"C\" {", - "#include <gbm.h>", "}" ], "main": "gbm_surface *surface = 0;" @@ -252,7 +260,11 @@ "integrityhid": { "label": "integrityhid", "test": { - "include": [ "stdlib.h", "stdint.h", "device/hiddriver.h" ], + "head": [ + "#include <stdlib.h>", + "#include <stdint.h>" + ], + "include": "device/hiddriver.h", "main": [ "HIDDriver *driver;", "uintptr_t devicecontext;", @@ -267,10 +279,13 @@ "libjpeg": { "label": "libjpeg", "test": { - "include": [ "sys/types.h", "stdio.h" ], + "head": [ + "#include <sys/types.h>", + "#include <stdio.h>", + "extern \"C\" {" + ], + "include": "jpeglib.h", "tail": [ - "extern \"C\" {", - "#include <jpeglib.h>", "}", "", "j_compress_ptr cinfo;" @@ -393,13 +408,15 @@ "v4l2": { "label": "V4L2", "test": { + "head": [ + "#include <cstddef>", + "extern \"C\" {" + ], "include": [ - "cstddef" + "mediactl/mediactl.h", + "mediactl/v4l2subdev.h" ], "tail": [ - "extern \"C\" {", - "#include <mediactl/mediactl.h>", - "#include <mediactl/v4l2subdev.h>", "}" ], "main": [ |