diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-12-05 15:00:00 -0500 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-12-06 10:53:23 -0500 |
commit | 6c13216bdf287572c281edf97ec661470193aaa0 (patch) | |
tree | 3d9381321d5c5cd5adffa43923c07b9f562a274c /meson.build | |
parent | 94fe681f49c1bb5ff501a01b9a079d3f6e87b51a (diff) | |
download | libsoup-6c13216bdf287572c281edf97ec661470193aaa0.tar.gz |
Meson: Always fallback to find_library() for sqlite/libxml2
It's not only Visual Studio that doesn't have a pkg-config file, also
Android for example.
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 66337c1f..d85f947b 100644 --- a/meson.build +++ b/meson.build @@ -62,20 +62,18 @@ glib_dep = [dependency('glib-2.0', version : glib_required_version, dependency('gio-2.0', version : glib_required_version, fallback: ['glib', 'libgio_dep'])] -sqlite_dep = dependency('sqlite3', required: cc.get_id() != 'msvc') +sqlite_dep = dependency('sqlite3', required: false) -# Fallback check for sqlite on Visual Studio, which normally does not -# generate a pkg-config file upon a successful build +# Fallback check for sqlite, not all platforms ship pkg-config file if not sqlite_dep.found() cc.has_header('sqlite3.h') cc.has_header('sqlite3ext.h') sqlite_dep = cc.find_library('sqlite3') endif -libxml_dep = dependency('libxml-2.0', required: cc.get_id() != 'msvc') +libxml_dep = dependency('libxml-2.0', required: false) -# Fallback check for libxml2 on Visual Studio, which normally does not -# generate a pkg-config file upon a successful build +# Fallback check for libxml2, not all platforms ship pkg-config file if not libxml_dep.found() # Note: The XML include dir needs to be within the INCLUDE envvar, # such as <INCLUDEDIR>\libxml2 |