diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-09 14:13:59 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-10-18 10:01:02 +0200 |
| commit | e20d68aa0b9546655c4017fb7341173bba825958 (patch) | |
| tree | 97e2f603e13f773af4fd1e6ccc27c57974adeaf2 /qga | |
| parent | 17599573bf1ff18442e34d6760bbb8d090a30a08 (diff) | |
| download | qemu-e20d68aa0b9546655c4017fb7341173bba825958.zip qemu-e20d68aa0b9546655c4017fb7341173bba825958.tar.gz qemu-e20d68aa0b9546655c4017fb7341173bba825958.tar.bz2 | |
configure, meson: use command line options to configure qemu-ga
Preserve the functionality of the environment variables, but
allow using the command line instead.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/meson.build | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qga/meson.build b/qga/meson.build index 59cae0c..940a51d 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -145,6 +145,9 @@ if targetos == 'windows' else libpcre = 'libpcre2' endif + qga_msi_version = get_option('qemu_ga_version') == '' \ + ? project.version() \ + : get_option('qemu_ga_version') qga_msi = custom_target('QGA MSI', input: files('installer/qemu-ga.wxs'), output: 'qemu-ga-@0@.msi'.format(host_arch), @@ -155,9 +158,9 @@ if targetos == 'windows' qemu_ga_msi_vss, '-D', 'BUILD_DIR=' + meson.project_build_root(), '-D', 'BIN_DIR=' + glib_pc.get_variable('bindir'), - '-D', 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'], - '-D', 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'], - '-D', 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'], + '-D', 'QEMU_GA_VERSION=' + qga_msi_version, + '-D', 'QEMU_GA_MANUFACTURER=' + get_option('qemu_ga_manufacturer'), + '-D', 'QEMU_GA_DISTRO=' + get_option('qemu_ga_distro'), '-D', 'LIBPCRE=' + libpcre, ]) all_qga += [qga_msi] |