[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 147/147] meson: avoid unstable module warning with Meson 0.56.0 o
From: |
Paolo Bonzini |
Subject: |
[PATCH 147/147] meson: avoid unstable module warning with Meson 0.56.0 or newer |
Date: |
Mon, 10 Aug 2020 19:09:05 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 6556a48..8551ed5 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,11 @@ project('qemu', ['c', 'cpp'], meson_version: '>=0.55.0',
version: run_command('head', meson.source_root() /
'VERSION').stdout().strip())
not_found = dependency('', required: false)
-keyval = import('unstable-keyval')
+if meson.version().version_compare('>=0.56.0')
+ keyval = import('keyval')
+else
+ keyval = import('unstable-keyval')
+endif
ss = import('sourceset')
sh = find_program('sh')
--
1.8.3.1
- [PATCH 139/147] meson: replace create-config with meson configure_file, (continued)
[PATCH 142/147] meson: convert VNC and dependent libraries to meson, Paolo Bonzini, 2020/08/10
[PATCH 143/147] meson: convert po/, Paolo Bonzini, 2020/08/10
[PATCH 146/147] cflags Signed-off-by: Paolo Bonzini <address@hidden>, Paolo Bonzini, 2020/08/10
[PATCH 147/147] meson: avoid unstable module warning with Meson 0.56.0 or newer,
Paolo Bonzini <=
[PATCH 145/147] acceptance: use stable URLs for the Debian and Ubuntu installer, Paolo Bonzini, 2020/08/10
[PATCH 144/147] meson: update build-system documentation, Paolo Bonzini, 2020/08/10
Re: [PATCH 000/147] Meson integration for 5.2, Peter Maydell, 2020/08/10
Re: [PATCH 000/147] Meson integration for 5.2, Peter Maydell, 2020/08/10