Merge pull request #162 from thinkski/master
Add libiconv dep to meson build
This commit is contained in:
commit
03df58fc96
|
@ -27,6 +27,7 @@ libidn2_dep = notfound
|
|||
libicu_dep = notfound
|
||||
libidn_dep = notfound
|
||||
libunistring = notfound
|
||||
libiconv = notfound
|
||||
networking_deps = notfound
|
||||
|
||||
# FIXME: Cleanup this when Meson gets 'feature-combo':
|
||||
|
@ -94,6 +95,7 @@ endif
|
|||
if libidn2_dep.found() or libidn_dep.found()
|
||||
# Check for libunistring, we need it for psl_str_to_utf8lower()
|
||||
libunistring = cc.find_library('unistring')
|
||||
libiconv = cc.find_library('libiconv')
|
||||
endif
|
||||
|
||||
if host_machine.system() == 'windows'
|
||||
|
|
|
@ -19,7 +19,7 @@ cargs = [
|
|||
libpsl = library('psl', sources, suffixes_dafsa_h,
|
||||
include_directories : [configinc, includedir],
|
||||
c_args : cargs,
|
||||
dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps],
|
||||
dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps, libiconv],
|
||||
version: lt_version,
|
||||
install: true,
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue