[gupnp/wip/phako/ci: 1/2] build: Add gssdp as subproject for CI
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp/wip/phako/ci: 1/2] build: Add gssdp as subproject for CI
- Date: Sat, 22 May 2021 16:09:00 +0000 (UTC)
commit 99b276c00fb8e47c69f9991bac1458c4cfc58f96
Author: Jens Georg <mail jensge org>
Date: Sat May 22 18:07:45 2021 +0200
build: Add gssdp as subproject for CI
libgupnp/meson.build | 4 ++--
meson.build | 4 ++--
subprojects/gssdp-1.2.wrap | 9 +++++++++
3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/libgupnp/meson.build b/libgupnp/meson.build
index fb0f77d..6eed590 100644
--- a/libgupnp/meson.build
+++ b/libgupnp/meson.build
@@ -117,10 +117,10 @@ gupnp = declare_dependency(
)
pkg.generate(
- libraries : libgupnp,
+ libgupnp,
subdirs: 'gupnp-1.2',
name : 'gupnp-1.2',
- requires : dependencies,
+ requires : ['glib-2.0', 'gio-2.0', 'gssdp-1.2'],
description : 'GObject-based UPnP library',
version : meson.project_version(),
filebase : 'gupnp-1.2'
diff --git a/meson.build b/meson.build
index bf9a49d..ffa9f99 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gupnp', 'c', version : '1.2.4', meson_version : '>= 0.48.0')
+project('gupnp', 'c', version : '1.2.4', meson_version : '>= 0.53.0')
gnome = import('gnome')
pkg = import('pkgconfig')
@@ -14,7 +14,7 @@ conf.set('HAVE_IFADDRS_H', ifaddrs_available)
conf.set('HAVE_LINUX_WIRELESS_H', cc.has_header('linux/wireless.h'))
config_h = configure_file(output : 'config.h', configuration : conf)
-add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c')
+add_project_arguments('-DHAVE_CONFIG_H=1', language : 'c')
guul = subproject('guul', default_options : ['default_library=static'])
diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap
new file mode 100644
index 0000000..1f1348e
--- /dev/null
+++ b/subprojects/gssdp-1.2.wrap
@@ -0,0 +1,9 @@
+[wrap-git]
+#url = https://gitlab.gnome.org/GNOME/gssdp.git
+url = file:///home/jens/Source/gssdp
+revision = master
+depth = 1
+
+[provides]
+dependency_name = gssdp-1.2
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]