Skip to content

Commit

Permalink
Merge pull request #705 from kiwix/better-libzim-version-check
Browse files Browse the repository at this point in the history
Better check libzim and libkiwix deps
  • Loading branch information
kelson42 authored Sep 15, 2024
2 parents da22757 + ce3c3bd commit 5e222b3
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ if static_linkage
endif

thread_dep = dependency('threads')
libzim_dep = dependency('libzim', version:'>=9.0.0', static:static_linkage)
libzim_dep = dependency('libzim', version:'<10.0.0', static:static_linkage)
kiwixlib_dep = dependency('kiwix', version:'>=14.0.0', static:static_linkage)
kiwixlib_dep = dependency('kiwix', version:'<15.0.0', static:static_linkage)
docopt_dep = dependency('docopt', static:static_linkage)
libzim_dep = dependency('libzim', version:['>=9.0.0', '<10.0.0'], static:static_linkage)
libkiwix_dep = dependency('kiwix', version:['>=14.0.0', '<15.0.0'], static:static_linkage)
libdocopt_dep = dependency('docopt', static:static_linkage)

all_deps = [thread_dep, kiwixlib_dep, libzim_dep, docopt_dep]
all_deps = [thread_dep, libkiwix_dep, libzim_dep, libdocopt_dep]

if static_linkage
librt = compiler.find_library('rt', required:false)
Expand Down

0 comments on commit 5e222b3

Please sign in to comment.