diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-02-02 00:23:33 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-21 10:35:54 +0100 |
| commit | 1e1223249d3ae12023cd6ef811979b26ee6d5584 (patch) | |
| tree | 226b9c6043c44d41b7cd7facfeeaf6ca768c5e42 | |
| parent | 8821a389b1fa2b27bf20245ad059f75482e5f25d (diff) | |
| download | focaccia-qemu-1e1223249d3ae12023cd6ef811979b26ee6d5584.tar.gz focaccia-qemu-1e1223249d3ae12023cd6ef811979b26ee6d5584.zip | |
meson: do not make qga/vss-win32/meson.build conditional on C++ presence
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> Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | qga/vss-win32/meson.build | 41 |
1 files 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) |