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

[meson] Let name_prefix of exported libraries the default 

meson complains about this and it is the default per #2256

Fixes #2256
This commit is contained in:
Ebrahim Byagowi 2020-05-10 14:46:16 +04:30
parent 2ac4222022
commit eea99d7b72
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/meson.build
View File

@ -366,10 +366,8 @@ if cpp.get_id() == 'msvc'
extra_hb_cpp_args += '-DHB_DLL_EXPORT'
endif
hb_so_version = ''
hb_lib_prefix = ''
else
hb_so_version = '0'
hb_lib_prefix = 'lib'
endif
libharfbuzz = library('harfbuzz', hb_sources,
@ -380,7 +378,7 @@ libharfbuzz = library('harfbuzz', hb_sources,
version: version,
install: true,
link_language: chosen_linker,
name_prefix: hb_lib_prefix)
)
libharfbuzz_dep = declare_dependency(
link_with: libharfbuzz,
@ -402,7 +400,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
version: version,
install: true,
link_language: chosen_linker,
name_prefix: hb_lib_prefix)
)
libharfbuzz_subset_dep = declare_dependency(
link_with: libharfbuzz_subset,
@ -531,7 +529,7 @@ if have_icu and not have_icu_builtin
install: true,
# ICU links to stdc++ anyway so the default linker is good
# link_language: chosen_linker,
name_prefix: hb_lib_prefix)
)
libharfbuzz_icu_dep = declare_dependency(
link_with: libharfbuzz_icu,
@ -615,7 +613,7 @@ if have_gobject
version: version,
install: true,
link_language: chosen_linker,
name_prefix: hb_lib_prefix)
)
gir = find_program('g-ir-scanner', required: get_option('introspection'))
build_gir = gir.found() and not meson.is_cross_build()