[libsoup] Meson: Always fallback to find_library() for sqlite/libxml2



commit 6c13216bdf287572c281edf97ec661470193aaa0
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Wed Dec 5 15:00:00 2018 -0500

    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.

 meson.build | 10 ++++------
 1 file 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]