diff options
| author | Felipe Corrêa da Silva Sanches <juca@members.fsf.org> | 2018-03-16 03:16:29 +0000 |
|---|---|---|
| committer | Felipe Corrêa da Silva Sanches <juca@members.fsf.org> | 2018-03-17 20:54:37 +0000 |
| commit | afc9c11e9a698af1f9dd7cb3846e4a858724ee5c (patch) | |
| tree | 6eaf133e0f0a5d301e60ab529afa35c5ae099720 | |
| parent | [meson-build] wip: inkgc + ui + libnrtype (diff) | |
| download | inkscape-afc9c11e9a698af1f9dd7cb3846e4a858724ee5c.tar.gz inkscape-afc9c11e9a698af1f9dd7cb3846e4a858724ee5c.zip | |
[meson-build] declaring more libnrtype and libinkgc dependencies
| -rw-r--r-- | meson.build | 13 | ||||
| -rw-r--r-- | src/inkgc/meson.build | 3 | ||||
| -rw-r--r-- | src/libnrtype/meson.build | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/meson.build b/meson.build index 3fdba9fd4..085a8cbe3 100644 --- a/meson.build +++ b/meson.build @@ -11,11 +11,14 @@ project('inkscape', 'cpp', sigcpp_req = '>= 2.6.2' #TODO: review required version: 2.8.0 ? gdl_req = '>= 3.6.0' pango_req = '>= 1.41.0' +pangoft2_req = '>= 1.37.2' cairo_req = '>= 1.14.0' glib_req = '>= 2.36.0' glibmm_req = '>= 2.46.3' #TODO review: 2.54.0 ? gtkmm_req = '>= 3.16.0' xml2_req = '>= 2.7.4' +harfbuzz_req = '>= 0.9' +bohemgc_req = '>= 7.4.2' # Dependencies sigcpp_dep = dependency('sigc++-2.0', version: sigcpp_req, required : true) @@ -25,11 +28,11 @@ xml2_dep = dependency('libxml-2.0', version: xml2_req, required : true) glib_dep = dependency('glib-2.0', version: glib_req, required : true) glibmm_dep = dependency('glibmm-2.4', version: glibmm_req, required : true) gtkmm_dep = dependency('gtkmm-3.0', version: gtkmm_req, required : true) -pango_dep = dependency('pango', version: pango_req, - fallback : ['pango', 'libpango_dep']) -pangocairo_dep = dependency('pangocairo', version: cairo_req, - fallback : ['pango', 'libpangocairo_dep']) -harfbuzz_dep = dependency('harfbuzz', version: '>= 0.9', required: false) +pango_dep = dependency('pango', version: pango_req, required : true) +pangoft2_dep = dependency('pangoft2', version: pangoft2_req, required : true) +pangocairo_dep = dependency('pangocairo', version: cairo_req, required : true) +harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req, required: false) +boehmgc_dep = dependency('bdw-gc', version: bohemgc_req, required: true) common_cflags = '' common_ldflags = '' diff --git a/src/inkgc/meson.build b/src/inkgc/meson.build index 80e3e1a31..c69603315 100644 --- a/src/inkgc/meson.build +++ b/src/inkgc/meson.build @@ -13,7 +13,8 @@ inkgc_headers = files([ inkgc_deps = [ glib_dep, glibmm_dep, - sigcpp_dep + sigcpp_dep, + boehmgc_dep ] libinkgc = static_library('inkgc', diff --git a/src/libnrtype/meson.build b/src/libnrtype/meson.build index d84586d6e..c35c89f49 100644 --- a/src/libnrtype/meson.build +++ b/src/libnrtype/meson.build @@ -23,7 +23,9 @@ layout_tng_headers = files([ layout_tng_deps = [ glib_dep, gtkmm_dep, - xml2_dep + xml2_dep, + pangoft2_dep, + harfbuzz_dep ] libnrtype = static_library('nrtype', |