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

[meson] minor

This commit is contained in:
Ebrahim Byagowi 2020-08-13 01:23:46 +04:30 committed by ebraminio
parent 6e32145dc9
commit 411b426c69
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/meson.build
View File

@ -562,17 +562,11 @@ endif
have_gobject = conf.get('HAVE_GOBJECT', 0) == 1 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 = configuration_data()
cmake_config.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) cmake_config.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
cmake_config.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) cmake_config.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
cmake_config.set('HB_LIBTOOL_VERSION_INFO', hb_libtool_version_info) 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', configure_file(input: 'harfbuzz-config.cmake.in',
output: 'harfbuzz-config.cmake', output: 'harfbuzz-config.cmake',
configuration: cmake_config, configuration: cmake_config,
@ -677,15 +671,15 @@ if have_gobject
endif endif
if build_gir if build_gir
gobject_sources = hb_gen_files_gir libharfbuzz_gobject_sources = hb_gen_files_gir
else else
gobject_sources = hb_gobject_sources libharfbuzz_gobject_sources = hb_gobject_sources
endif endif
libharfbuzz_gobject_dep = declare_dependency( libharfbuzz_gobject_dep = declare_dependency(
link_with: libharfbuzz_gobject, link_with: libharfbuzz_gobject,
include_directories: incsrc, include_directories: incsrc,
sources: gobject_sources, sources: libharfbuzz_gobject_sources,
dependencies: [glib_dep, gobject_dep]) dependencies: [glib_dep, gobject_dep])
pkgmod.generate(libharfbuzz_gobject, pkgmod.generate(libharfbuzz_gobject,