[Spice-commits] meson.build subprojects/spice-common

[GitLab Mirror]

 meson.build              |   13 ++++++++-----
 subprojects/spice-common |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit eb31f1345912c58b74d1c3d66cfc9f8a79509053
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Wed Apr 8 08:21:03 2020 +0100

    build: Tell SPICE common the SPICE protocol version we require
    
    This allows SPICE common to request the right version.
    This is also implemented by Autoconf build already.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

diff --git a/meson.build b/meson.build
index f9090a82..5ab0e716 100644
--- a/meson.build
+++ b/meson.build
@@ -49,13 +49,19 @@ spice_server_include = [include_directories('.')]
 spice_server_deps = [dependency('threads')]
 spice_server_link_args = []
 spice_server_requires = ''
+spice_protocol_version='0.14.0'
 
 #
 # Spice common subproject
 #
-spice_common = subproject('spice-common', default_options : 'generate-code=server')
+spice_common = subproject('spice-common',
+                          default_options : [
+                            'generate-code=server',
+                            'spice-protocol-version=@0@'.format(spice_protocol_version),
+                          ])
 spice_server_config_data.merge_from(spice_common.get_variable('spice_common_config_data'))
 spice_server_deps += spice_common.get_variable('spice_common_server_dep')
+spice_protocol_version = spice_common.get_variable('spice_protocol_version')
 
 #
 # check for system headers
@@ -79,14 +85,11 @@ endif
 #
 # check for mandatory dependencies
 #
-spice_protocol_version='0.14.0'
-
 glib_version = '2.38'
 glib_version_info = '>= @0@'.format(glib_version)
 pixman_version = '>= 0.17.7'
 
-deps = {'spice-protocol' : '>= @0@'.format(spice_protocol_version),
-        'glib-2.0'       : glib_version_info,
+deps = {'glib-2.0'       : glib_version_info,
         'gio-2.0'        : glib_version_info,
         'gobject-2.0'    : glib_version_info,
         'pixman-1'       : pixman_version,
diff --git a/subprojects/spice-common b/subprojects/spice-common
index 47e14970..402bc6b2 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 47e149705a5bb1d4a615facfd9bd0190d9b0647c
+Subproject commit 402bc6b2371c5e7214c765778f34697fb47cc88e