From 14b5c774c205a1f8db72fa68a3e626391e917e09 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Wed, 14 Nov 2018 21:05:47 +0200 Subject: [PATCH] meson: Fix include directory when used as subproject HarfBuzz headers are under src/ not the root directory, without using incsrc no headers will be found by the dependent project. I think incbase is superfluous, it should be replaced by incsrc or dropped. --- src/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/meson.build b/src/meson.build index b8a402e10..f71db03dd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -203,7 +203,7 @@ libharfbuzz = library('harfbuzz', hb_sources, libharfbuzz_dep = declare_dependency( link_with: libharfbuzz, - include_directories: [incbase, incucdn], + include_directories: [incsrc, incucdn], dependencies: deps) # harfbuzz-subset @@ -224,7 +224,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, libharfbuzz_subset_dep = declare_dependency( link_with: libharfbuzz_subset, - include_directories: incbase, + include_directories: incsrc, dependencies: deps) pkgmod.generate(libharfbuzz, @@ -319,7 +319,7 @@ if conf.get('HAVE_GOBJECT', 0) == 1 libharfbuzz_gobject_dep = declare_dependency( link_with: libharfbuzz_gobject, - include_directories: incbase, + include_directories: incsrc, sources: hb_gen_files_gir, dependencies: deps)