1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: express dependency of fontconfig on freetype more clearly

Browse Source 
use a "use" entry instead of including the transitive dep into the list
of libraries.
this also removes the redundant check of freetype features from the
fontconfig test code.

Change-Id: I86b78028255c9bf0a62be5ec0f97a62ef3fda36f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2017-12-07 11:59:30 +01:00
parent f6f6958a3e
commit 016ab238b6
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/configure.json
View File

@ -164,25 +164,20 @@
"label": "Fontconfig", "label": "Fontconfig",
"test": { "test": {
"head": [ "head": [
"#include <ft2build.h>",
"#include FT_FREETYPE_H",
"#include <fontconfig/fontconfig.h>", "#include <fontconfig/fontconfig.h>",
"#ifndef FC_RGBA_UNKNOWN", "#ifndef FC_RGBA_UNKNOWN",
"# error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define", "# error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
"#endif",
"#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110)",
"# error This version of freetype is too old.",
"#endif" "#endif"
], ],
"main": [ "main": [
"FT_Face face = 0;",
"FcPattern *pattern = 0;" "FcPattern *pattern = 0;"
] ]
}, },
"sources": [ "sources": [
{ "type": "pkgConfig", "args": "fontconfig freetype2" }, { "type": "pkgConfig", "args": "fontconfig" },
{ "type": "freetype", "libs": "-lfontconfig -lfreetype" } { "type": "freetype", "libs": "-lfontconfig" }
] ],
"use": "freetype"
}, },
"gbm": { "gbm": {
"label": "GBM", "label": "GBM",