[wing] Use subprojects if not found glib



commit 37ff976645f5083e2f269037c0a8cb05539fc893
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date:   Wed Aug 22 11:49:50 2018 +0200

    Use subprojects if not found glib

 meson.build                    | 23 +++++++++++++++++++----
 subprojects/glib.wrap          |  3 +++
 subprojects/libffi.wrap        |  4 ++++
 subprojects/proxy-libintl.wrap |  4 ++++
 subprojects/zlib.wrap          | 10 ++++++++++
 5 files changed, 40 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5d68a95..b7c8351 100644
--- a/meson.build
+++ b/meson.build
@@ -120,10 +120,25 @@ core_inc = include_directories('.')
 # Required dependencies
 glib_req = '2.44.0'
 conf.set('GLIB_REQUIRED', glib_req)
-glib = dependency('glib-2.0', version: '>=' + glib_req)
-gobject = dependency('gobject-2.0', version: '>=' + glib_req)
-gio = dependency('gio-2.0', version: '>=' + glib_req)
-gio_windows = dependency('gio-windows-2.0', version: '>=' + glib_req)
+glib = dependency('glib-2.0', version: '>=' + glib_req, required: false)
+if not glib.found()
+  glib = subproject('glib').get_variable('libglib_dep')
+endif
+
+gobject = dependency('gobject-2.0', version: '>=' + glib_req, required: false)
+if not gobject.found()
+  gobject = subproject('glib').get_variable('libgobject_dep')
+endif
+
+gio = dependency('gio-2.0', version: '>=' + glib_req, required: false)
+if not gio.found()
+  gio = subproject('glib').get_variable('libgio_dep')
+endif
+
+gio_windows = dependency('gio-windows-2.0', version: '>=' + glib_req, required: false)
+if not gio_windows.found()
+  gio_windows = subproject('glib').get_variable('libgiowin32_dep')
+endif
 
 subdir('wing')
 subdir('tests')
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
new file mode 100644
index 0000000..e9cfee7
--- /dev/null
+++ b/subprojects/glib.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+directory=glib
+url=https://gitlab.gnome.org/GNOME/glib.git
diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap
new file mode 100644
index 0000000..3d15e2a
--- /dev/null
+++ b/subprojects/libffi.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libffi
+url=https://github.com/centricular/libffi.git
+revision=meson
diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap
new file mode 100644
index 0000000..b53c8f7
--- /dev/null
+++ b/subprojects/proxy-libintl.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=proxy-libintl
+url=https://github.com/frida/proxy-libintl.git
+revision=0.1
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
new file mode 100644
index 0000000..6aff13f
--- /dev/null
+++ b/subprojects/zlib.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = zlib-1.2.11
+
+source_url = https://zlib.net/fossils/zlib-1.2.11.tar.gz
+source_filename = zlib-1.2.11.tar.gz
+source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/3/get_zip
+patch_filename = zlib-1.2.11-3-wrap.zip
+patch_hash = f07dc491ab3d05daf00632a0591e2ae61b470615b5b73bcf9b3f061fff65cff0


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