walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Khaled Hosny 2018-11-14 21:05:47 +02:00 committed by Ebrahim Byagowi
parent 6abe7983ed
commit 14b5c774c2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/meson.build
View File

@ -203,7 +203,7 @@ libharfbuzz = library('harfbuzz', hb_sources,
libharfbuzz_dep = declare_dependency( libharfbuzz_dep = declare_dependency(
link_with: libharfbuzz, link_with: libharfbuzz,
include_directories: [incbase, incucdn], include_directories: [incsrc, incucdn],
dependencies: deps) dependencies: deps)
# harfbuzz-subset # harfbuzz-subset
@ -224,7 +224,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
libharfbuzz_subset_dep = declare_dependency( libharfbuzz_subset_dep = declare_dependency(
link_with: libharfbuzz_subset, link_with: libharfbuzz_subset,
include_directories: incbase, include_directories: incsrc,
dependencies: deps) dependencies: deps)
pkgmod.generate(libharfbuzz, pkgmod.generate(libharfbuzz,
@ -319,7 +319,7 @@ if conf.get('HAVE_GOBJECT', 0) == 1
libharfbuzz_gobject_dep = declare_dependency( libharfbuzz_gobject_dep = declare_dependency(
link_with: libharfbuzz_gobject, link_with: libharfbuzz_gobject,
include_directories: incbase, include_directories: incsrc,
sources: hb_gen_files_gir, sources: hb_gen_files_gir,
dependencies: deps) dependencies: deps)