diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-02-01 16:53:43 +0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-21 10:35:54 +0100 |
commit | 8821a389b1fa2b27bf20245ad059f75482e5f25d (patch) | |
tree | 47d715317ebcdfe38465e18c6f476e83c4a1cae0 /meson.build | |
parent | 61fb0bd1f6eaec5f9715031df79c7bbba72acbd9 (diff) | |
download | qemu-8821a389b1fa2b27bf20245ad059f75482e5f25d.zip qemu-8821a389b1fa2b27bf20245ad059f75482e5f25d.tar.gz qemu-8821a389b1fa2b27bf20245ad059f75482e5f25d.tar.bz2 |
configure, meson: replace VSS SDK checks and options with --enable-vss-sdk
The VSS headers are part of standard MS VS SDK, at least since version
15, and probably before that.
They are also included with MinGW, although currently broken.
Let's streamline a bit the options, by not making it so special, and
instead rely on proper system headers configuration or user
--extra-cxxflags. This still requires some extra step to cross-build
with MinGW as described in the meson.build file now.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[Use a "feature"-type option. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 20d5990..2818b93 100644 --- a/meson.build +++ b/meson.build @@ -1926,6 +1926,14 @@ config_host_data.set('CONFIG_AF_VSOCK', cc.compiles(gnu_source_prefix + ''' return -1; }''')) +have_vss = false +if targetos == 'windows' and link_language == 'cpp' + have_vss = cxx.compiles(''' + #define __MIDL_user_allocate_free_DEFINED__ + #include <inc/win2003/vss.h> + int main(void) { return VSS_CTX_BACKUP; }''') +endif + ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target 'HAVE_GDB_BIN'] arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST'] @@ -3592,7 +3600,7 @@ summary_info += {'libiscsi support': libiscsi} summary_info += {'libnfs support': libnfs} if targetos == 'windows' if have_ga - summary_info += {'QGA VSS support': config_host.has_key('CONFIG_QGA_VSS')} + summary_info += {'QGA VSS support': have_qga_vss} summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')} endif endif |