meson: add feature option for internal ucdn lib

This commit is contained in:
Tim-Philipp Müller 2018-11-12 15:58:09 +00:00 committed by Ebrahim Byagowi
parent 49ba211a9d
commit c81290b0c1
2 changed files with 10 additions and 9 deletions

View File

@ -13,6 +13,8 @@ option('graphite', type: 'feature', value: 'disabled',
description: 'Enable Graphite2 complementary shaper')
option('freetype', type: 'feature', value: 'auto',
description: 'Enable freetype interop helpers')
option('ucdn', type: 'feature', value: 'auto',
description: 'Use internal HarfBuzz-provided UCDN library')
# Common feature options
#option('tests', type : 'feature', value : 'auto', yield : true,

View File

@ -116,11 +116,6 @@ hb_uniscribe_sources = [
'hb-uniscribe.cc',
]
hb_ucdn_sources = [
'hb-ucdn.cc',
'hb-ucdn/ucdn.c',
]
hb_icu_sources = [
'hb-icu.cc',
]
@ -152,14 +147,18 @@ hb_gobject_headers = [
'hb-gobject-structs.h',
]
conf.set('HAVE_UCDN', 1)
incucdn = include_directories('hb-ucdn')
incucdn = []
incsrc = include_directories('.')
hb_sources = hb_base_sources + hb_fallback_sources + hb_ot_sources + hb_ucdn_sources
hb_sources = hb_base_sources + hb_fallback_sources + hb_ot_sources
hb_headers = hb_base_headers + hb_ot_headers
if not get_option('ucdn').disabled()
conf.set('HAVE_UCDN', 1)
hb_sources += ['hb-ucdn.cc', 'hb-ucdn/ucdn.c']
incucdn = include_directories('hb-ucdn')
endif
if conf.get('HAVE_FREETYPE', 0) == 1
hb_sources += hb_ft_sources
hb_headers += hb_ft_headers