|
 |
30761c |
From 2ee0253554227bd0cd26a00467765187168dda87 Mon Sep 17 00:00:00 2001
|
|
|
30761c |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
|
30761c |
Date: Wed, 2 Feb 2022 00:23:33 +0400
|
|
|
30761c |
Subject: [PATCH] meson: do not make qga/vss-win32/meson.build conditional on
|
|
|
30761c |
C++ presence
|
|
|
30761c |
MIME-Version: 1.0
|
|
|
30761c |
Content-Type: text/plain; charset=UTF-8
|
|
|
30761c |
Content-Transfer-Encoding: 8bit
|
|
|
30761c |
|
|
|
30761c |
C++ presence is checked by the qga/ directory, so it can be assumed
|
|
|
30761c |
when building VSS module.
|
|
|
30761c |
|
|
|
30761c |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
30761c |
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
|
|
|
30761c |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
30761c |
---
|
|
|
30761c |
qga/vss-win32/meson.build | 41 +++++++++++++++++++++++----------------
|
|
|
30761c |
1 file changed, 24 insertions(+), 17 deletions(-)
|
|
|
30761c |
|
|
|
30761c |
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
|
|
|
30761c |
index 90825edef3..5982a6c6d8 100644
|
|
|
30761c |
--- a/qga/vss-win32/meson.build
|
|
|
30761c |
+++ b/qga/vss-win32/meson.build
|
|
|
30761c |
@@ -1,22 +1,29 @@
|
|
|
30761c |
-if add_languages('cpp', required: false)
|
|
|
30761c |
- glib_dynamic = dependency('glib-2.0', static: false)
|
|
|
30761c |
- link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong',
|
|
|
30761c |
- '-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup'])
|
|
|
30761c |
+glib_dynamic = dependency('glib-2.0', static: false)
|
|
|
30761c |
+link_args = cc.get_supported_link_arguments([
|
|
|
30761c |
+ '-fstack-protector-all',
|
|
|
30761c |
+ '-fstack-protector-strong',
|
|
|
30761c |
+ '-Wl,--add-stdcall-alias',
|
|
|
30761c |
+ '-Wl,--enable-stdcall-fixup'
|
|
|
30761c |
+])
|
|
|
30761c |
|
|
|
30761c |
- qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'],
|
|
|
30761c |
- name_prefix: '',
|
|
|
30761c |
- cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
|
|
|
30761c |
- link_args: link_args,
|
|
|
30761c |
- vs_module_defs: 'qga-vss.def',
|
|
|
30761c |
- dependencies: [glib_dynamic, socket,
|
|
|
30761c |
- cc.find_library('ole32'),
|
|
|
30761c |
- cc.find_library('oleaut32'),
|
|
|
30761c |
- cc.find_library('shlwapi'),
|
|
|
30761c |
- cc.find_library('uuid'),
|
|
|
30761c |
- cc.find_library('intl')])
|
|
|
30761c |
+qga_vss = shared_module(
|
|
|
30761c |
+ 'qga-vss',
|
|
|
30761c |
+ ['requester.cpp', 'provider.cpp', 'install.cpp'],
|
|
|
30761c |
+ name_prefix: '',
|
|
|
30761c |
+ cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
|
|
|
30761c |
+ link_args: link_args,
|
|
|
30761c |
+ vs_module_defs: 'qga-vss.def',
|
|
|
30761c |
+ dependencies: [
|
|
|
30761c |
+ glib_dynamic, socket,
|
|
|
30761c |
+ cc.find_library('ole32'),
|
|
|
30761c |
+ cc.find_library('oleaut32'),
|
|
|
30761c |
+ cc.find_library('shlwapi'),
|
|
|
30761c |
+ cc.find_library('uuid'),
|
|
|
30761c |
+ cc.find_library('intl')
|
|
|
30761c |
+ ]
|
|
|
30761c |
+)
|
|
|
30761c |
|
|
|
30761c |
- all_qga += qga_vss
|
|
|
30761c |
-endif
|
|
|
30761c |
+all_qga += qga_vss
|
|
|
30761c |
|
|
|
30761c |
# rules to build qga-vss.tlb
|
|
|
30761c |
# Currently, only native build is supported because building .tlb
|
|
|
30761c |
--
|
|
|
30761c |
2.25.1
|
|
|
30761c |
|