diff options
| author | Ebrahim Byagowi <ebrahim@gnu.org> | 2020-08-13 01:23:46 +0430 |
|---|---|---|
| committer | ebraminio <ebraminio@gmail.com> | 2020-08-13 18:28:42 +0430 |
| commit | 411b426c692f611dbcdec7a6516781aa4375d07e (patch) | |
| tree | c0be79fb69e17b155eb3560d4417a13b25db9e50 /src | |
| parent | 6e32145dc91e866132a3a3911870441e98737b16 (diff) | |
| download | harfbuzz_ng-411b426c692f611dbcdec7a6516781aa4375d07e.tar.gz | |
[meson] minor
Diffstat (limited to 'src')
| -rw-r--r-- | src/meson.build | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/meson.build b/src/meson.build index 53290e1b6..f71cb5e17 100644 --- a/src/meson.build +++ b/src/meson.build @@ -562,17 +562,11 @@ 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_string) +cmake_config.set('have_gobject', '@0@'.format(have_gobject)) configure_file(input: 'harfbuzz-config.cmake.in', output: 'harfbuzz-config.cmake', configuration: cmake_config, @@ -677,15 +671,15 @@ if have_gobject endif if build_gir - gobject_sources = hb_gen_files_gir + libharfbuzz_gobject_sources = hb_gen_files_gir else - gobject_sources = hb_gobject_sources + libharfbuzz_gobject_sources = hb_gobject_sources endif libharfbuzz_gobject_dep = declare_dependency( link_with: libharfbuzz_gobject, include_directories: incsrc, - sources: gobject_sources, + sources: libharfbuzz_gobject_sources, dependencies: [glib_dep, gobject_dep]) pkgmod.generate(libharfbuzz_gobject, |