[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/7] meson: Fix build with --disable-guest-agent-msi
From: |
Paolo Bonzini |
Subject: |
[PULL 3/7] meson: Fix build with --disable-guest-agent-msi |
Date: |
Wed, 18 Nov 2020 11:19:36 +0100 |
From: Stefan Weil <sw@weilnetz.de>
The QGA MSI target requires several macros which are only available
without --disable-guest-agent-msi.
Don't define that target if configure was called with --disable-guest-agent-msi.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20201117201834.408892-1-sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/meson.build | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/qga/meson.build b/qga/meson.build
index 53ba6de5f8..520af6ce9b 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -61,23 +61,25 @@ if targetos == 'windows'
if 'CONFIG_QGA_VSS' in config_host and 'QEMU_GA_MSI_WITH_VSS' in
config_host
deps += qga_vss
endif
- qga_msi = custom_target('QGA MSI',
- input: files('installer/qemu-ga.wxs'),
- output:
'qemu-ga-@0@.msi'.format(config_host['ARCH']),
- depends: deps,
- command: [
- find_program('env'),
- 'QEMU_GA_VERSION=' +
config_host['QEMU_GA_VERSION'],
- 'QEMU_GA_MANUFACTURER=' +
config_host['QEMU_GA_MANUFACTURER'],
- 'QEMU_GA_DISTRO=' +
config_host['QEMU_GA_DISTRO'],
- 'BUILD_DIR=' + meson.build_root(),
- wixl, '-o', '@OUTPUT0@', '@INPUT0@',
- config_host['QEMU_GA_MSI_ARCH'].split(),
- config_host['QEMU_GA_MSI_WITH_VSS'].split(),
-
config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
- ])
- all_qga += [qga_msi]
- alias_target('msi', qga_msi)
+ if 'CONFIG_QGA_MSI' in config_host
+ qga_msi = custom_target('QGA MSI',
+ input: files('installer/qemu-ga.wxs'),
+ output:
'qemu-ga-@0@.msi'.format(config_host['ARCH']),
+ depends: deps,
+ command: [
+ find_program('env'),
+ 'QEMU_GA_VERSION=' +
config_host['QEMU_GA_VERSION'],
+ 'QEMU_GA_MANUFACTURER=' +
config_host['QEMU_GA_MANUFACTURER'],
+ 'QEMU_GA_DISTRO=' +
config_host['QEMU_GA_DISTRO'],
+ 'BUILD_DIR=' + meson.build_root(),
+ wixl, '-o', '@OUTPUT0@', '@INPUT0@',
+ config_host['QEMU_GA_MSI_ARCH'].split(),
+ config_host['QEMU_GA_MSI_WITH_VSS'].split(),
+
config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
+ ])
+ all_qga += [qga_msi]
+ alias_target('msi', qga_msi)
+ endif
endif
else
install_subdir('run', install_dir: get_option('localstatedir'))
--
2.28.0
- [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Paolo Bonzini, 2020/11/18
- [PULL 1/7] meson: Fix argument for makensis (build regression), Paolo Bonzini, 2020/11/18
- [PULL 2/7] docs: Fix some typos (found by codespell), Paolo Bonzini, 2020/11/18
- [PULL 4/7] meson: Fixes curses detection on msys2, Paolo Bonzini, 2020/11/18
- [PULL 3/7] meson: Fix build with --disable-guest-agent-msi,
Paolo Bonzini <=
- [PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET, Paolo Bonzini, 2020/11/18
- [PULL 6/7] hvf: Fix segment selector format, Paolo Bonzini, 2020/11/18
- [PULL 7/7] buildsys: Help git-diff adding .gitattributes config file, Paolo Bonzini, 2020/11/18
- Re: [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Peter Maydell, 2020/11/18