On Mon, Jan 07, 2019 at 12:00:55PM +0400, marcandre.lureau@xxxxxxxxxx wrote:
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
>
> It makes it non-obvious what that variable actually is.
Reviewed-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
> ---
> meson.build | 9 ++++-----
> src/meson.build | 2 +-
> 2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index b596a0f..bbfd8d0 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -34,7 +34,6 @@ spice_gtk_include = [include_directories('.')]
> spice_glib_deps = []
> spice_gtk_deps = []
> spice_acl_deps = []
> -spice_gtk_host_system = host_machine.system()
>
> #
> # Spice common subproject
> @@ -93,7 +92,7 @@ endforeach
> # mandatory dependencies, without specific version requirement
> # TODO: specify minimum version for cairo, jpeg and zlib?
> deps = ['cairo', 'libjpeg', 'zlib', 'json-glib-1.0']
> -if spice_gtk_host_system == 'windows'
> +if host_machine.system() == 'windows'
> deps += 'gio-windows-2.0'
> else
> deps += 'gio-unix-2.0'
> @@ -104,7 +103,7 @@ foreach dep : deps
> endforeach
>
> deps = []
> -if spice_gtk_host_system == 'windows'
> +if host_machine.system() == 'windows'
> deps += ['libws2_32', 'libgdi32']
> endif
>
> @@ -132,7 +131,7 @@ d = dependency('gtk+-3.0', version : '>= @0@'.format(gtk_version_required),
> required: get_option('gtk'))
> if d.found()
> spice_gtk_deps += d
> - if spice_gtk_host_system != 'windows'
> + if host_machine.system() != 'windows'
> spice_gtk_deps += dependency('epoxy')
> spice_gtk_deps += dependency('x11')
> endif
> @@ -245,7 +244,7 @@ spice_gtk_coroutine = get_option('coroutine')
> if spice_gtk_coroutine == 'ucontext'
> if compiler.has_function('makecontext') and compiler.has_function('swapcontext') and compiler.has_function('getcontext')
> spice_gtk_config_data.set('WITH_UCONTEXT', '1')
> - if spice_gtk_host_system == 'darwin'
> + if host_machine.system() == 'darwin'
> spice_gtk_config_data.set('_XOPEN_SOURCE', '1')
> endif
> else
> diff --git a/src/meson.build b/src/meson.build
> index 0057dfc..d9614cb 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -154,7 +154,7 @@ elif spice_gtk_coroutine == 'winfiber'
> spice_client_glib_sources += 'coroutine_winfibers.c'
> endif
>
> -if spice_gtk_has_usbredir and spice_gtk_host_system == 'windows'
> +if spice_gtk_has_usbredir and host_machine.system() == 'windows'
> spice_client_glib_sources += ['usbdk_api.c',
> 'usbdk_api.h',
> 'win-usb-dev.c',
> --
> 2.20.1.2.gb21ebb671b
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel