diff --git a/meson.build b/meson.build index 50e684fbc..6d5257a47 100644 --- a/meson.build +++ b/meson.build @@ -55,7 +55,7 @@ endif deps = [] conf = configuration_data() -incbase = include_directories('.') +incconfig = include_directories('.') cpp_args = ['-DHAVE_CONFIG_H'] warn_cflags = [ diff --git a/src/meson.build b/src/meson.build index f71db03dd..807a7727d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -192,7 +192,7 @@ harfbuzz_def = custom_target('harfbuzz.def', version = '0.' + '0'.join(meson.project_version().split('.')) + '.0' libharfbuzz = library('harfbuzz', hb_sources, - include_directories: [incbase, incucdn], + include_directories: [incconfig, incucdn], dependencies: deps, cpp_args: cpp_args, vs_module_defs: harfbuzz_def, @@ -213,7 +213,7 @@ harfbuzz_subset_def = custom_target('harfbuzz-subset.def', output: 'harfbuzz-subset.def') libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, - include_directories: incbase, + include_directories: incconfig, link_with: [libharfbuzz], cpp_args: cpp_args, vs_module_defs: harfbuzz_subset_def, @@ -284,7 +284,7 @@ if conf.get('HAVE_GOBJECT', 0) == 1 output: 'harfbuzz-gobject.def') libharfbuzz_gobject = library('harfbuzz-gobject', [hb_gobject_sources, enum_c, enum_h], - include_directories: incbase, + include_directories: incconfig, dependencies: deps, link_with: [libharfbuzz], cpp_args: cpp_args, diff --git a/test/api/meson.build b/test/api/meson.build index 27ea026fe..1b7819791 100644 --- a/test/api/meson.build +++ b/test/api/meson.build @@ -40,7 +40,7 @@ if conf.get('HAVE_GLIB', 0) == 1 test_name = fname.split('.')[0].underscorify() exe = executable(test_name, fname, cpp_args: cpp_args + extra_c_args, - include_directories: [incbase, incsrc], + include_directories: [incconfig, incsrc], dependencies: deps, link_with: [libharfbuzz, libharfbuzz_subset], ) diff --git a/test/fuzzing/meson.build b/test/fuzzing/meson.build index d72cd6ea5..a479c4cab 100644 --- a/test/fuzzing/meson.build +++ b/test/fuzzing/meson.build @@ -10,7 +10,7 @@ foreach test_data : tests exe = executable(test_name, [fname, 'main.cc'], cpp_args: cpp_args, - include_directories: [incbase, incsrc], + include_directories: [incconfig, incsrc], dependencies: deps, link_with: [libharfbuzz, libharfbuzz_subset], ) diff --git a/util/meson.build b/util/meson.build index 0c2e381e8..e4b4c1aa9 100644 --- a/util/meson.build +++ b/util/meson.build @@ -27,7 +27,7 @@ if conf.get('HAVE_GLIB', 0) == 1 hb_view = executable('hb-view', hb_view_sources, cpp_args: cpp_args, - include_directories: [incbase, incsrc], + include_directories: [incconfig, incsrc], dependencies: deps, link_with: [libharfbuzz], install: true, @@ -36,7 +36,7 @@ if conf.get('HAVE_GLIB', 0) == 1 hb_shape = executable('hb-shape', hb_shape_sources, cpp_args: cpp_args, - include_directories: [incbase, incsrc], + include_directories: [incconfig, incsrc], dependencies: deps, link_with: [libharfbuzz], install: true, @@ -44,7 +44,7 @@ if conf.get('HAVE_GLIB', 0) == 1 hb_subset = executable('hb-subset', hb_subset_cli_sources, cpp_args: cpp_args, - include_directories: [incbase, incsrc], + include_directories: [incconfig, incsrc], dependencies: deps, link_with: [libharfbuzz, libharfbuzz_subset], install: true, @@ -52,7 +52,7 @@ if conf.get('HAVE_GLIB', 0) == 1 hb_ot_shape_closure = executable('hb-ot-shape-closure', hb_ot_shape_closure_sources, cpp_args: cpp_args, - include_directories: [incbase, incsrc], + include_directories: [incconfig, incsrc], dependencies: deps, link_with: [libharfbuzz], install: true,