smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

There is no need for zlib/bzip/lzma dependencies. 

They are provided by libzim.
This commit is contained in:
Matthieu Gautier 2016-12-20 23:37:59 +01:00
parent 8ce1fb0ba8
commit 8b34414458
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -5,14 +5,12 @@ project('kiwixlib', 'cpp',
compiler = meson.get_compiler('cpp') compiler = meson.get_compiler('cpp')
thread_dep = dependency('threads') thread_dep = dependency('threads')
zlib_dep = dependency('zlib')
bzip_dep = dependency('bzip2')
libicu_dep = dependency('icu-i18n') libicu_dep = dependency('icu-i18n')
lzma_dep = dependency('liblzma')
libzim_dep = dependency('zimlib') libzim_dep = dependency('zimlib')
pugixml_dep = dependency('pugixml') pugixml_dep = dependency('pugixml')
aria2_dep = find_program('aria2c') aria2_dep = find_program('aria2c')
ctpp2_prefix_install = get_option('ctpp2-install-prefix') ctpp2_prefix_install = get_option('ctpp2-install-prefix')
if get_option('default_library') == 'static' if get_option('default_library') == 'static'
libname = 'ctpp2-st' libname = 'ctpp2-st'
@ -37,14 +35,16 @@ else
ctpp2_dep = declare_dependency(include_directories:ctpp2_include_path, dependencies:[ctpp2_lib]) ctpp2_dep = declare_dependency(include_directories:ctpp2_include_path, dependencies:[ctpp2_lib])
endif endif
pkg_requires = ['zimlib', 'icu-i18n', 'pugixml']
xapian_dep = dependency('xapian-core', required:false) xapian_dep = dependency('xapian-core', required:false)
if xapian_dep.found() if xapian_dep.found()
pkg_requires += ['xapian-core']
message('xapian_dep found') message('xapian_dep found')
else else
message('xapian_dep not found') message('xapian_dep not found')
endif endif
all_deps = [thread_dep, zlib_dep, libicu_dep, lzma_dep, libzim_dep, ctpp2_dep, xapian_dep, pugixml_dep, bzip_dep] all_deps = [thread_dep, libicu_dep, libzim_dep, ctpp2_dep, xapian_dep, pugixml_dep]
inc = include_directories('include') inc = include_directories('include')
@ -57,5 +57,5 @@ pkg_mod.generate(libraries : kiwixlib,
name : 'libkiwix', name : 'libkiwix',
filebase : 'kiwix', filebase : 'kiwix',
description : 'A library that contains a lot of things used by used by other kiwix programs', description : 'A library that contains a lot of things used by used by other kiwix programs',
requires: ['zimlib', 'zlib', 'xapian-core', 'icu-i18n', 'liblzma', 'bzip2', 'pugixml']) requires: pkg_requires)