Skip to content

Commit

Permalink
Correctly depends on ICU
Browse files Browse the repository at this point in the history
`getTextLength` in `metadata.cpp` directly use icu so we must explicitly
depend on it.
It was working as libzim wrongly put it in it `libzim.pc` file.
  • Loading branch information
mgautierfr committed Aug 19, 2024
1 parent 21ac578 commit 7e89024
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ with_xapian_support = compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIA
find_library_in_compiler = meson.version().version_compare('>=0.31.0')
rt_dep = dependency('rt', required:false)
docopt_dep = dependency('docopt', static:static_linkage)
icu_dep = dependency('icu-i18n', static:static_linkage)

with_writer = host_machine.system() != 'windows'

Expand Down
2 changes: 1 addition & 1 deletion src/zimcheck/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ executable('zimcheck',
'../tools.cpp',
'../metadata.cpp',
include_directories : inc,
dependencies: [libzim_dep, thread_dep],
dependencies: [libzim_dep, icu_dep, thread_dep],
install: true)


2 changes: 1 addition & 1 deletion src/zimwriterfs/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sources = [
'zimcreatorfs.cpp'
]

deps = [thread_dep, libzim_dep, zlib_dep, gumbo_dep, magic_dep]
deps = [thread_dep, libzim_dep, zlib_dep, gumbo_dep, magic_dep, icu_dep]

zimwriterfs = executable('zimwriterfs',
sources,
Expand Down
2 changes: 1 addition & 1 deletion test/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if gtest_dep.found() and not meson.is_cross_build()
foreach test_name : tests

test_exe = executable(test_name, [test_name+'.cpp'] + tests_src_map[test_name],
dependencies : [gtest_dep, libzim_dep, gumbo_dep, magic_dep, zlib_dep],
dependencies : [gtest_dep, libzim_dep, gumbo_dep, magic_dep, zlib_dep, icu_dep],
include_directories: inc,
build_rpath : '$ORIGIN')

Expand Down

0 comments on commit 7e89024

Please sign in to comment.