diff options
| author | Ebrahim Byagowi <ebrahim@gnu.org> | 2020-08-12 23:04:26 +0430 |
|---|---|---|
| committer | ebraminio <ebraminio@gmail.com> | 2020-08-13 18:28:42 +0430 |
| commit | 58209c86a0d2d536ce3d35953ffe340762ad1f48 (patch) | |
| tree | 875c56ec0c3a345fc91f5ee39cdd1facfac78d4d /src | |
| parent | 1e4fe10b98a291787ae561beca80cb70b481b108 (diff) | |
| download | harfbuzz_ng-58209c86a0d2d536ce3d35953ffe340762ad1f48.tar.gz | |
[meson] Make compatbile with 0.49.0
Contains a just put together summary feature polyfill and workaround
to broken ternary operator.
Diffstat (limited to 'src')
| -rw-r--r-- | src/meson.build | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/meson.build b/src/meson.build index 7bdaee43a..b53d8b259 100644 --- a/src/meson.build +++ b/src/meson.build @@ -563,15 +563,22 @@ endif have_gobject = conf.get('HAVE_GOBJECT', 0) == 1 +if have_gobject + have_gobject_string = 'true' +else + have_gobject_string = 'false' +endif + cmake_config = configuration_data() cmake_config.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) cmake_config.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) cmake_config.set('HB_LIBTOOL_VERSION_INFO', hb_libtool_version_info) -cmake_config.set('have_gobject', have_gobject ? 'true' : 'false') +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: get_option('libdir') / 'cmake' / 'harfbuzz', +) libharfbuzz_gobject_dep = null_dep if have_gobject @@ -670,10 +677,16 @@ if have_gobject '--cflags-end']) endif + if build_gir + gobject_sources = hb_gen_files_gir + else + gobject_sources = hb_gobject_sources + endif + libharfbuzz_gobject_dep = declare_dependency( link_with: libharfbuzz_gobject, include_directories: incsrc, - sources: build_gir ? hb_gen_files_gir : hb_gobject_sources, + sources: gobject_sources, dependencies: [glib_dep, gobject_dep]) pkgmod.generate(libharfbuzz_gobject, @@ -721,10 +734,15 @@ if get_option('tests').enabled() endif foreach name : dist_check_script + if name == 'check-symbols' + test_depends = defs_list + else + test_depends = [] + endif test(name, find_program(name + '.py'), env: env, - depends: name == 'check-symbols' ? defs_list : [], - suite: ['src'] + (name == 'check-static-inits' ? ['slow'] : []), + depends: test_depends, + suite: ['src'], ) endforeach endif |