AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Harfbuzz detection

Browse Source 
We use

    qt_find_package(harfbuzz PROVIDED_TARGETS harfbuzz::harfbuzz)

which would set harfbuzz_FOUND. Since variable names are case-sensitive,
this is also the name we must check for in the qt feature condition.

Change-Id: I43420489c3310bc9c3e5cc798a005c8d5b0ab646
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Simon Hausmann 2019-08-30 15:03:50 +02:00
parent 4670e0a1fd
commit 8da5305102
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/configure.cmake
View File

@ -566,7 +566,7 @@ qt_feature("fontconfig" PUBLIC PRIVATE
qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1")
qt_feature("harfbuzz" PUBLIC PRIVATE
LABEL "HarfBuzz"
CONDITION HARFBUZZ_FOUND
CONDITION harfbuzz_FOUND
)
qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1")
qt_feature("qqnx_imf" PRIVATE

2
util/cmake/configurejson2cmake.py
View File

@ -660,7 +660,7 @@ def parseFeature(ctx, feature, data, cm_fh):
},
'GNUmake': None,
'harfbuzz': {
'condition': 'HARFBUZZ_FOUND'
'condition': 'harfbuzz_FOUND'
},
'host-dbus': None,
'iconv': {