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

Correctly discover if we have libiconv and use it if necessary.

This commit is contained in:
Matthieu Gautier 2017-02-22 12:06:31 +01:00
parent 84796abb4c
commit 9616530648
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meson.build
View File

@ -21,12 +21,17 @@ if ctpp2_prefix_install == ''
else else
ctpp2_lib = find_library('ctpp2') ctpp2_lib = find_library('ctpp2')
endif endif
# if meson.is_cross_build()
# if host_machine.system() == 'windows'
# link_args += ['-liconv']
# endif
# endif
ctpp2_link_args = ['-lctpp2'] ctpp2_link_args = ['-lctpp2']
if meson.is_cross_build() and host_machine.system() == 'windows'
if find_library_in_compiler
iconv_lib = compiler.find_library('iconv', required:false)
else
iconv_lib = find_library('iconv', required:false)
endif
if iconv_lib.found()
ctpp2_link_args += ['-liconv']
endif
endif
has_ctpp2_dep = true has_ctpp2_dep = true
ctpp2_dep = declare_dependency(link_args:ctpp2_link_args) ctpp2_dep = declare_dependency(link_args:ctpp2_link_args)
else else
@ -42,12 +47,13 @@ else
ctpp2_include_dir = include_directories(ctpp2_include_path, is_system:true) ctpp2_include_dir = include_directories(ctpp2_include_path, is_system:true)
ctpp2_lib_path = ctpp2_prefix_install+'/lib' ctpp2_lib_path = ctpp2_prefix_install+'/lib'
ctpp2_lib = compiler.find_library('ctpp2', dirs:ctpp2_lib_path) ctpp2_lib = compiler.find_library('ctpp2', dirs:ctpp2_lib_path)
# if meson.is_cross_build()
# if host_machine.system() == 'windows'
# link_args += ['-liconv']
# endif
# endif
ctpp2_link_args = ['-L'+ctpp2_lib_path, '-lctpp2'] ctpp2_link_args = ['-L'+ctpp2_lib_path, '-lctpp2']
if meson.is_cross_build() and host_machine.system() == 'windows'
iconv_lib = compiler.find_library('iconv', required:false)
if iconv_lib.found()
ctpp2_link_args += ['-liconv']
endif
endif
has_ctpp2_dep = true has_ctpp2_dep = true
ctpp2_dep = declare_dependency(include_directories:ctpp2_include_dir, link_args:ctpp2_link_args) ctpp2_dep = declare_dependency(include_directories:ctpp2_include_dir, link_args:ctpp2_link_args)
else else