Re: [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence

[Konstantin Kostiuk <kkostiuk@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 2759 bytes --]

Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Thu, Feb 3, 2022 at 8:14 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> C++ presence is checked by the qga/ directory, so it can be assumed
> when building VSS module.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  qga/vss-win32/meson.build | 41 +++++++++++++++++++++++----------------
>  1 file changed, 24 insertions(+), 17 deletions(-)
>
> diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
> index 8f3aff5fe3..8d4c5708d8 100644
> --- a/qga/vss-win32/meson.build
> +++ b/qga/vss-win32/meson.build
> @@ -1,22 +1,29 @@
> -if add_languages('cpp', required: false)
> -  glib_dynamic = dependency('glib-2.0', static: false)
> -  link_args = cc.get_supported_link_arguments(['-fstack-protector-all',
> '-fstack-protector-strong',
> -                                               '-Wl,--add-stdcall-alias',
> '-Wl,--enable-stdcall-fixup'])
> +glib_dynamic = dependency('glib-2.0', static: false)
> +link_args = cc.get_supported_link_arguments([
> +  '-fstack-protector-all',
> +  '-fstack-protector-strong',
> +  '-Wl,--add-stdcall-alias',
> +  '-Wl,--enable-stdcall-fixup'
> +])
>
> -  qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp',
> 'install.cpp'],
> -                name_prefix: '',
> -                cpp_args: ['-Wno-unknown-pragmas',
> '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
> -                link_args: link_args,
> -                vs_module_defs: 'qga-vss.def',
> -                dependencies: [glib_dynamic, socket,
> -                               cc.find_library('ole32'),
> -                               cc.find_library('oleaut32'),
> -                               cc.find_library('shlwapi'),
> -                               cc.find_library('uuid'),
> -                               cc.find_library('intl')])
> +qga_vss = shared_module(
> +  'qga-vss',
> +  ['requester.cpp', 'provider.cpp', 'install.cpp'],
> +  name_prefix: '',
> +  cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor',
> '-Wno-non-virtual-dtor'],
> +  link_args: link_args,
> +  vs_module_defs: 'qga-vss.def',
> +  dependencies: [
> +    glib_dynamic, socket,
> +    cc.find_library('ole32'),
> +    cc.find_library('oleaut32'),
> +    cc.find_library('shlwapi'),
> +    cc.find_library('uuid'),
> +    cc.find_library('intl')
> +  ]
> +)
>
> -  all_qga += qga_vss
> -endif
> +all_qga += qga_vss
>
>  midl = find_program('midl', required: false)
>  widl = find_program('widl', required: false)
> --
> 2.34.1
>
>
>
>

[-- Attachment #2: Type: text/html, Size: 3916 bytes --]