kiwix/libkiwix
1
0
Fork 0
mirror of https://github.com/kiwix/libkiwix.git synced 2025-09-07 06:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correctly set pkgconfig file for static curl linking.

Browse Source
This commit is contained in:
Matthieu Gautier 2018-10-30 12:59:30 +01:00
parent 29e554b47b
commit 5ed095531e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -19,8 +19,10 @@ libzim_dep = dependency('libzim', version : '>=4.0.0', static:static_deps)
pugixml_dep = dependency('pugixml', static:static_deps) pugixml_dep = dependency('pugixml', static:static_deps)
libcurl_dep = dependency('libcurl', static:static_deps) libcurl_dep = dependency('libcurl', static:static_deps)
extra_cflags = ''
if target_machine.system() == 'windows' and static_deps if target_machine.system() == 'windows' and static_deps
add_project_arguments('-DCURL_STATICLIB', language : 'cpp') add_project_arguments('-DCURL_STATICLIB', language : 'cpp')
extra_cflags += '-DCURL_STATICLIB'
endif endif
@ -112,11 +114,10 @@ if xapian_dep.found()
pkg_requires += ['xapian-core'] pkg_requires += ['xapian-core']
endif endif
extra_cflags = ''
if has_ctpp2_dep if has_ctpp2_dep
extra_libs += ctpp2_link_args extra_libs += ctpp2_link_args
if ctpp2_include_path != '' if ctpp2_include_path != ''
extra_cflags = '-I'+ctpp2_include_path extra_cflags = ' -I'+ctpp2_include_path
endif endif
endif endif