oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'icu76-support' of https://github.com/cho-m/MPD

This commit is contained in:
Max Kellermann 2024-10-27 15:22:04 +01:00
parent 51e0fefda7 1a063fee7e
commit 1930ed16cb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/icu/meson.build
View File

@ -1,5 +1,7 @@
icu_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu')) icu_i18n_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu'))
conf.set('HAVE_ICU', icu_dep.found()) icu_uc_dep = dependency('icu-uc', version: '>= 50', required: get_option('icu'))
have_icu = icu_i18n_dep.found() and icu_uc_dep.found()
conf.set('HAVE_ICU', have_icu)
icu_sources = [ icu_sources = [
'Canonicalize.cxx', 'Canonicalize.cxx',
@ -13,7 +15,7 @@ if is_windows
endif endif
iconv_dep = [] iconv_dep = []
if icu_dep.found() if have_icu
icu_sources += [ icu_sources += [
'Init.cxx', 'Init.cxx',
'Util.cxx', 'Util.cxx',
@ -31,7 +33,8 @@ icu = static_library(
icu_sources, icu_sources,
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
icu_dep, icu_i18n_dep,
icu_uc_dep,
iconv_dep, iconv_dep,
fmt_dep, fmt_dep,
], ],