diff options
| author | Ebrahim Byagowi <ebrahim@gnu.org> | 2020-08-13 00:13:06 +0430 |
|---|---|---|
| committer | ebraminio <ebraminio@gmail.com> | 2020-08-13 18:28:42 +0430 |
| commit | 6e32145dc91e866132a3a3911870441e98737b16 (patch) | |
| tree | b074799b46516b1d4259e07a037f1e1ed70b7c45 /src | |
| parent | 58209c86a0d2d536ce3d35953ffe340762ad1f48 (diff) | |
| download | harfbuzz_ng-6e32145dc91e866132a3a3911870441e98737b16.tar.gz | |
[meson] Make compatbile with 0.47.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/meson.build | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/meson.build b/src/meson.build index b53d8b259..53290e1b6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -488,21 +488,20 @@ if get_option('tests').enabled() endforeach compiled_tests = { + 'test-algs': ['test-algs.cc', 'hb-static.cc'], 'test-array': 'test-array.cc', + 'test-iter': ['test-iter.cc', 'hb-static.cc'], + 'test-meta': ['test-meta.cc', 'hb-static.cc'], 'test-number': ['test-number.cc', 'hb-number.cc'], 'test-ot-tag': 'hb-ot-tag.cc', 'test-unicode-ranges': 'test-unicode-ranges.cc', + 'test-bimap': ['test-bimap.cc', 'hb-static.cc'], } - if cpp.get_id() != 'msvc' - # TODO: MSVC doesn't like these, fix them - compiled_tests += { - 'test-algs': ['test-algs.cc', 'hb-static.cc'], - 'test-bimap': ['test-bimap.cc', 'hb-static.cc'], - 'test-iter': ['test-iter.cc', 'hb-static.cc'], - 'test-meta': ['test-meta.cc', 'hb-static.cc'], - } - endif foreach name, source : compiled_tests + if cpp.get_id() == 'msvc' and ['test-algs', 'test-bimap', 'test-iter', 'test-meta'].contains(name) + # TODO: MSVC doesn't like these, fix them + continue + endif test(name, executable(name, source, include_directories: incconfig, cpp_args: cpp_args + ['-DMAIN', '-UNDEBUG'], @@ -577,7 +576,7 @@ cmake_config.set('have_gobject', have_gobject_string) configure_file(input: 'harfbuzz-config.cmake.in', output: 'harfbuzz-config.cmake', configuration: cmake_config, - install_dir: get_option('libdir') / 'cmake' / 'harfbuzz', + install_dir: join_paths(get_option('libdir'), 'cmake', 'harfbuzz'), ) libharfbuzz_gobject_dep = null_dep @@ -615,7 +614,7 @@ if have_gobject output: 'hb-gobject-enums.h', command: [find_program('fix_get_types.py'), '@INPUT@', '@OUTPUT@'], install: true, - install_dir: get_option('prefix') / get_option('includedir') / meson.project_name(), + install_dir: join_paths(get_option('prefix'), get_option('includedir'), meson.project_name()), ) hb_gobject_sources += [enum_c] |