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

cmake: Cleanup harfbuzz features

Browse Source 
Remove system-harfbuzz feature and use harfbuzz feature as system

Change-Id: I441345a667450f1c2d19380b0709911011c7ceb7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Михаил Светкин 2019-02-11 13:27:00 +01:00 committed by Mikhail Svetkin
parent 07f922286c
commit 3c9d7dfb30
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/configure.cmake
View File

@ -6,10 +6,6 @@
set(INPUT_freetype "undefined" CACHE STRING "") set(INPUT_freetype "undefined" CACHE STRING "")
set_property(CACHE INPUT_freetype PROPERTY STRINGS undefined no qt system) set_property(CACHE INPUT_freetype PROPERTY STRINGS undefined no qt system)
# input harfbuzz
set(INPUT_harfbuzz "undefined" CACHE STRING "")
set_property(CACHE INPUT_harfbuzz PROPERTY STRINGS undefined no qt system)
# input libjpeg # input libjpeg
set(INPUT_libjpeg "undefined" CACHE STRING "") set(INPUT_libjpeg "undefined" CACHE STRING "")
set_property(CACHE INPUT_libjpeg PROPERTY STRINGS undefined no qt system) set_property(CACHE INPUT_libjpeg PROPERTY STRINGS undefined no qt system)
@ -479,15 +475,9 @@ qt_feature("fontconfig" PUBLIC PRIVATE
qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1") qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1")
qt_feature("harfbuzz" PUBLIC PRIVATE qt_feature("harfbuzz" PUBLIC PRIVATE
LABEL "HarfBuzz" LABEL "HarfBuzz"
CONDITION HARFBUZZ_FOUND
) )
qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1") qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1")
qt_feature("system_harfbuzz" PRIVATE
LABEL " Using system HarfBuzz"
AUTODETECT NOT APPLE AND NOT WIN32
CONDITION QT_FEATURE_harfbuzz AND harfbuzz_FOUND
ENABLE INPUT_harfbuzz STREQUAL 'system'
DISABLE INPUT_harfbuzz STREQUAL 'qt'
)
qt_feature("qqnx_imf" PRIVATE qt_feature("qqnx_imf" PRIVATE
LABEL "IMF" LABEL "IMF"
CONDITION libs.imf OR FIXME CONDITION libs.imf OR FIXME

6
util/cmake/configurejson2cmake.py
View File

@ -432,6 +432,8 @@ def parseInput(ctx, input, data, cm_fh):
"gui", "gui",
"harfbuzz",
"headersclean", "headersclean",
"incredibuild-xge", "incredibuild-xge",
@ -708,6 +710,9 @@ def parseFeature(ctx, feature, data, cm_fh):
'disable': 'NOT TEST_posix_iconv OR TEST_iconv_needlib', 'disable': 'NOT TEST_posix_iconv OR TEST_iconv_needlib',
}, },
'GNUmake': None, 'GNUmake': None,
'harfbuzz': {
'condition': 'HARFBUZZ_FOUND'
},
'host-dbus': None, 'host-dbus': None,
'iconv': { 'iconv': {
'condition': 'NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )' 'condition': 'NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )'
@ -759,6 +764,7 @@ def parseFeature(ctx, feature, data, cm_fh):
}, },
'system-doubleconversion': None, # No system libraries anymore! 'system-doubleconversion': None, # No system libraries anymore!
'system-freetype': None, 'system-freetype': None,
'system-harfbuzz': None,
'system-jpeg': None, 'system-jpeg': None,
'system-pcre2': None, 'system-pcre2': None,
'system-png': None, 'system-png': None,