[gupnp/wip/phako/ci] ci: Fix gir include for subproject

[Jens Georg <jensgeorg src gnome org>]

commit 7d7171f74770400d1bba0da2daf26a4db818ce8c
Author: Jens Georg <mail jensge org>
Date:   Sat May 22 19:22:17 2021 +0200

    ci: Fix gir include for subproject

 .gitlab-ci.yml       | 6 +++---
 libgupnp/meson.build | 8 +++++++-
 meson.build          | 4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73de47a..62374c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ check-merge-request:
 .build-template: &build
   stage: build
   script:
-      - meson . build --prefix=/usr -Db_coverage=true -Dgssdp-1.2:sniffer=false
+      - meson . build --prefix=/usr -Db_coverage=true
       - ninja -C build
   artifacts:
       expire_in: 1 day
@@ -159,7 +159,7 @@ static-scan:
   needs:
     - build-fedora-container@x86_64
   script:
-    - meson --buildtype=debug _scan_build -Dgssdp-1.2:sniffer=false
+    - meson --buildtype=debug _scan_build
     - ninja -C _scan_build scan-build
   artifacts:
     paths:
@@ -172,7 +172,7 @@ pages:
     - .gupnp.fedora:34@x86_64
   stage: website
   script:
-      - meson doc-build -Dgtk_doc=true -Dgssdp-1.2:sniffer=false
+      - meson doc-build -Dgtk_doc=true
       - ninja -C doc-build gupnp-doc
       - mkdir -p public
       - mv doc-build/doc/html public/docs
diff --git a/libgupnp/meson.build b/libgupnp/meson.build
index 6eed590..8a976c1 100644
--- a/libgupnp/meson.build
+++ b/libgupnp/meson.build
@@ -127,6 +127,12 @@ pkg.generate(
 )
 
 if get_option('introspection')
+    gir_includes = ['GObject-2.0', 'Gio-2.0', 'Soup-2.4', 'libxml2-2.0']
+    if gssdp_dep.type_name() == 'internal'
+        gir_includes += subproject('gssdp-1.2').get_variable('gir').get(0)
+    else
+        gir_includes += 'GSSDP-1.2'
+    endif
     gir = gnome.generate_gir(
         libgupnp,
         sources : headers + sources + enums,
@@ -136,7 +142,7 @@ if get_option('introspection')
         symbol_prefix : 'gupnp',
         identifier_prefix : 'GUPnP',
         export_packages : 'gupnp-1.2',
-        includes : ['GObject-2.0', 'Gio-2.0', 'Soup-2.4', 'GSSDP-1.2', 'libxml2-2.0'],
+        includes : gir_includes,
         install : true,
         extra_args : '-DGOBJECT_INTROSPECTION_SKIP'
     )
diff --git a/meson.build b/meson.build
index ffa9f99..0aa3fe3 100644
--- a/meson.build
+++ b/meson.build
@@ -18,13 +18,15 @@ add_project_arguments('-DHAVE_CONFIG_H=1', language : 'c')
 
 guul = subproject('guul', default_options : ['default_library=static'])
 
+gssdp_dep = dependency('gssdp-1.2', version : '>= 1.2.4', default_options: ['sniffer=false'])
+
 dependencies = [
     dependency('glib-2.0', version : '>= 2.58'),
     dependency('gio-2.0', version : '>= 2.58'),
     dependency('gmodule-2.0', version : '>= 2.44'),
     dependency('gobject-2.0', version : '>= 2.44'),
-    dependency('gssdp-1.2', version : '>= 1.2.3'),
     dependency('libsoup-2.4', version : '>= 2.48.0'),
+    gssdp_dep,
     dependency('libxml-2.0')
 ]