Skip to content
Snippets Groups Projects
Commit e23460ce authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

meson: require dynamic linking for VSS support


The glib_dynamic detection does not work because the dependency is
overridden in the main meson.build.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
[Rewritten commit message, added requirement in qga/meson.build - Paolo]
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarKonstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 23011f44
No related branches found
No related tags found
No related merge requests found
......@@ -22,6 +22,8 @@ have_qga_vss = get_option('qga_vss') \
Then run configure with: --extra-cxxflags="-isystem /path/to/vss/inc/win2003"''') \
.require(midl.found() or widl.found(),
error_message: 'VSS support requires midl or widl') \
.require(not enable_static,
error_message: 'VSS support requires dynamic linking with GLib') \
.allowed()
all_qga = []
......
glib_dynamic = dependency('glib-2.0', static: false)
link_args = cc.get_supported_link_arguments([
'-fstack-protector-all',
'-fstack-protector-strong',
......@@ -14,7 +13,8 @@ qga_vss = shared_module(
link_args: link_args,
vs_module_defs: 'qga-vss.def',
dependencies: [
glib_dynamic, socket,
glib,
socket,
cc.find_library('ole32'),
cc.find_library('oleaut32'),
cc.find_library('shlwapi'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment