[gtksourceview/meson.msvc.cleanups: 4/4] gtksourceview/meson.build: Fix generating pkg-config



commit 2fbdd567baaa0eabaa4d165152ecb3539d2409c5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Nov 21 12:44:39 2019 +0800

    gtksourceview/meson.build: Fix generating pkg-config
    
    libxml2 could be found either via pkg-config or via manually looking for
    headers and libraries, so make sure we generate the pkg-config file
    appropriately.

 gtksourceview/meson.build | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
index 52302cc9..6f0e2886 100644
--- a/gtksourceview/meson.build
+++ b/gtksourceview/meson.build
@@ -315,8 +315,20 @@ gtksource_pc_reqs = [
   'gtk+-3.0 @0@'.format(gtk_req),
 ]
 
-gtksource_pc_private_reqs = [
-  'libxml-2.0 @0@'.format(libxml_req),
+gtksource_pc_private_reqs = []
+gtksource_lib_private = []
+
+if libxml_dep.type_name() == 'pkgconfig'
+  gtksource_pc_private_reqs += [
+    'libxml-2.0 @0@'.format(libxml_req)
+  ]
+else
+  if libxml_dep.type_name() == 'library'
+    gtksource_lib_private += libxml_dep
+  endif
+endif
+
+gtksource_pc_private_reqs += [
   'fribidi @0@'.format(fribidi_req),
 ]
 
@@ -328,5 +340,6 @@ gtksource_pc = pkg.generate(
            version: version,
            subdirs: package_string,
          libraries: gtksource_lib,
+ libraries_private: gtksource_lib_private,
        install_dir: pkgconfigdir,
 )


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