From 5ed095531e5bc8b26b718e1d96deb1dfdd59d037 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 30 Oct 2018 12:59:30 +0100 Subject: [PATCH] Correctly set pkgconfig file for static curl linking. --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 62c0bb26c..83f0b5d1f 100644 --- a/meson.build +++ b/meson.build @@ -19,8 +19,10 @@ libzim_dep = dependency('libzim', version : '>=4.0.0', static:static_deps) pugixml_dep = dependency('pugixml', static:static_deps) libcurl_dep = dependency('libcurl', static:static_deps) +extra_cflags = '' if target_machine.system() == 'windows' and static_deps add_project_arguments('-DCURL_STATICLIB', language : 'cpp') + extra_cflags += '-DCURL_STATICLIB' endif @@ -112,11 +114,10 @@ if xapian_dep.found() pkg_requires += ['xapian-core'] endif -extra_cflags = '' if has_ctpp2_dep extra_libs += ctpp2_link_args if ctpp2_include_path != '' - extra_cflags = '-I'+ctpp2_include_path + extra_cflags = ' -I'+ctpp2_include_path endif endif