[gnome-contacts/wip/nielsdg/libhandy-as-submodule] build: add libhandy as subproject



commit dcf7dc55d71f02cc3ac9dacb5e4327c4e5710ce5
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Mon Jan 14 08:53:27 2019 +0100

    build: add libhandy as subproject
    
    This should make it easier for build processes (like package builds)
    that run entirely offline to have the dependency available.
    
    We'd like to get rid of this submodule in the next release, but I guess
    it can't be avoided for now.
    
    Fixes #120

 .gitmodules          |  3 +++
 meson.build          | 15 +++++++++++++--
 subprojects/libhandy |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f4788ba
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "subprojects/libhandy"]
+       path = subprojects/libhandy
+       url = https://source.puri.sm/Librem5/libhandy.git
diff --git a/meson.build b/meson.build
index 6935715..028482f 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,6 @@ po_dir = join_paths(meson.source_root(), 'po')
 min_eds_version = '3.13.90'
 min_folks_version = '0.11.4'
 min_glib_version = '2.44' # We also use this value for --target-glib, so scratch the micro version.
-min_handy_version = '0.0.4'
 
 math = meson.get_compiler('c').find_library('m')
 
@@ -53,7 +52,6 @@ gtk = dependency('gtk+-3.0', version: '>= 3.23.1')
 libebook = dependency('libebook-1.2', version: '>=' + min_eds_version)
 libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_version)
 libedataserverui = dependency('libedataserverui-1.2', version: '>=' + min_eds_version)
-libhandy = dependency('libhandy-0.0', version: '>=' + min_handy_version)
 
 if cheese_enabled
   cheese = dependency('cheese')
@@ -65,6 +63,19 @@ if telepathy_enabled
   telepathy_glib = dependency('telepathy-glib', version: '>= 0.22.0')
 endif
 
+libhandy = dependency('libhandy-0.0', version: '>= 0.0.4', required: false)
+if not libhandy.found()
+  libhandy_subproj = subproject(
+    'libhandy',
+    default_options: [
+      'examples=false',
+      'glade_catalog=false',
+      'tests=false',
+    ]
+  )
+  libhandy = libhandy_subproj.get_variable('libhandy_dep')
+endif
+
 valadoc = find_program('valadoc', required: docs_enabled)
 
 
diff --git a/subprojects/libhandy b/subprojects/libhandy
new file mode 160000
index 0000000..4a2d491
--- /dev/null
+++ b/subprojects/libhandy
@@ -0,0 +1 @@
+Subproject commit 4a2d49195529c72aeaed5bb21f5ccfd84c59a6a5


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