[Spice-commits] 2 commits - src/meson.build

[GitLab Mirror]

 src/meson.build |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6f22589442beaf75bb12f22799f520256e18d648
Merge: 0beef9c b73dd98
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Sun Jan 20 07:54:03 2019 +0000

    Merge branch 'fix-cross-introspection' into 'master'
    
    meson: fix disabling introspection
    
    See merge request spice/spice-gtk!4

commit b73dd988dc71b543ff6be97d01e8e0e8b71bb886
Author: Rasmus Thomsen <rasmus.thomsen at protonmail.com>
Date:   Sun Jan 20 02:39:14 2019 +0100

    meson: fix disabling introspection
    
    Even with build_by_default: false meson seems to probe for
    g-ir-scanner.

diff --git a/src/meson.build b/src/meson.build
index c55db44..a5746f3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -203,8 +203,8 @@ spice_client_glib_dep = declare_dependency(sources : [spice_marshals[1], spice_c
 #
 # SpiceClientGLib-2.0.gir
 #
+if spice_gtk_has_introspection
 spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib,
-                                           build_by_default : spice_gtk_has_introspection,
                                            export_packages : 'spice-client-glib-2.0',
                                            extra_args : ['--accept-unprefixed'],
                                            header : 'spice-client.h',
@@ -217,7 +217,7 @@ spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib,
                                            namespace : 'SpiceClientGLib',
                                            nsversion : '2.0',
                                            sources : spice_client_glib_introspection_sources)
-
+endif
 #
 # spice-client-glib-usb-acl-helper
 #
@@ -340,11 +340,11 @@ if spice_gtk_has_gtk
                                             link_with : spice_client_gtk_lib,
                                             dependencies : [spice_client_glib_dep, spice_gtk_deps])
 
+if spice_gtk_has_introspection
   #
   # SpiceClientGtk-3.0.gir
   #
   spice_client_gtk_gir = gnome.generate_gir(spice_client_gtk_lib,
-                                            build_by_default : spice_gtk_has_introspection,
                                             export_packages : 'spice-client-gtk-3.0',
                                             extra_args : ['--accept-unprefixed'],
                                             header : 'spice-widget.h',
@@ -357,4 +357,5 @@ if spice_gtk_has_gtk
                                             namespace : 'SpiceClientGtk',
                                             nsversion : '3.0',
                                             sources : spice_client_gtk_introspection_sources)
+  endif
 endif