[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional o
From: |
Paolo Bonzini |
Subject: |
[PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence |
Date: |
Thu, 3 Feb 2022 18:33:55 +0100 |
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
- [PATCH 26/27] meson, configure: move ntddscsi API check to meson, (continued)
- [PATCH 26/27] meson, configure: move ntddscsi API check to meson, Paolo Bonzini, 2022/02/03
- [PATCH 27/27] configure, meson: move CONFIG_IASL to a Meson option, Paolo Bonzini, 2022/02/03
- [PATCH 18/27] qga/vss-win32: fix midl arguments, Paolo Bonzini, 2022/02/03
- [PATCH 20/27] qga/vss-win32: use widl if available, Paolo Bonzini, 2022/02/03
- [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence,
Paolo Bonzini <=
- [PATCH 19/27] meson: drop --with-win-sdk, Paolo Bonzini, 2022/02/03
- [PATCH 21/27] qga/vss: use standard windows headers location, Paolo Bonzini, 2022/02/03
- [PATCH 16/27] meson: refine check for whether to look for virglrenderer, Paolo Bonzini, 2022/02/03
- [PATCH 22/27] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk, Paolo Bonzini, 2022/02/03
- [PATCH 25/27] meson: require dynamic linking for VSS support, Paolo Bonzini, 2022/02/03