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

[GitLab Mirror]

 meson.build     |   13 ++-----------
 src/meson.build |    1 -
 2 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit e6040fe6ab2387c3d240a6863193b84d794df265
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Thu Sep 13 12:30:06 2018 +0200

    meson: Remove unnecessary variable spice_gtk_libs
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/meson.build b/meson.build
index 85f6e78..eba2c38 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,6 @@ compiler = meson.get_compiler('c')
 spice_gtk_config_data = configuration_data()
 spice_protocol_min_version='0.12.13'
 spice_gtk_include = [include_directories('.')]
-spice_gtk_libs = []
 spice_gtk_deps = []
 spice_gtk_host_system = host_machine.system()
 
diff --git a/src/meson.build b/src/meson.build
index 80e777d..dcf4dcc 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -199,7 +199,6 @@ spice_client_glib_lib = library('spice-client-glib-2.0', spice_client_glib_sourc
                                 include_directories : spice_gtk_include,
                                 link_args : [spice_gtk_version_script],
                                 link_depends : spice_client_glib_syms,
-                                link_with : spice_gtk_libs,
                                 dependencies : spice_gtk_deps)
 
 spice_client_glib_dep = declare_dependency(sources : [spice_marshals[1], spice_client_glib_enums[1]],
commit 6819da95a2b7301124181eaa7c07652668fdaca2
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Tue Sep 25 11:15:21 2018 -0300

    Bump meson requirement to 0.47.2
    
    This new version ships the fix for the issue where 'check' keyword could
    not be used in project definition, so we had to run that command again
    only to check if it succeeded.
    
    https://github.com/mesonbuild/meson/issues/3944
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/meson.build b/meson.build
index 875e07f..85f6e78 100644
--- a/meson.build
+++ b/meson.build
@@ -2,17 +2,9 @@
 # project definition
 #
 project('spice-gtk', 'c',
-         version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version').stdout().strip(),
+         version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(),
          license : 'LGPLv2.1',
-         meson_version : '>= 0.47.0')
-
-# double check meson.project_version()
-# we can not use 'check' keyword in run_command() for git-version-gen above
-# https://github.com/mesonbuild/meson/issues/3944
-version = run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip()
-if meson.project_version() != version
-  error('Wrong project version')
-endif
+         meson_version : '>= 0.47.2')
 
 message('Updating submodules')
 run_command('build-aux/meson/check-spice-common', check : true)