walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #162 from thinkski/master 

Add libiconv dep to meson build
This commit is contained in:
Tim Rühsen 2020-09-21 16:22:17 +02:00 committed by GitHub
parent 17cce94216 079e8d0f6c
commit 03df58fc96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -27,6 +27,7 @@ libidn2_dep = notfound
libicu_dep = notfound libicu_dep = notfound
libidn_dep = notfound libidn_dep = notfound
libunistring = notfound libunistring = notfound
libiconv = notfound
networking_deps = notfound networking_deps = notfound
# FIXME: Cleanup this when Meson gets 'feature-combo': # FIXME: Cleanup this when Meson gets 'feature-combo':
@ -94,6 +95,7 @@ endif
if libidn2_dep.found() or libidn_dep.found() if libidn2_dep.found() or libidn_dep.found()
# Check for libunistring, we need it for psl_str_to_utf8lower() # Check for libunistring, we need it for psl_str_to_utf8lower()
libunistring = cc.find_library('unistring') libunistring = cc.find_library('unistring')
libiconv = cc.find_library('libiconv')
endif endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'

2
src/meson.build
View File

@ -19,7 +19,7 @@ cargs = [
libpsl = library('psl', sources, suffixes_dafsa_h, libpsl = library('psl', sources, suffixes_dafsa_h,
include_directories : [configinc, includedir], include_directories : [configinc, includedir],
c_args : cargs, 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, version: lt_version,
install: true, install: true,
) )