[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 148/150] meson: avoid unstable module warning with Meson 0.56.0 o
From: |
Paolo Bonzini |
Subject: |
[PATCH 148/150] meson: avoid unstable module warning with Meson 0.56.0 or newer |
Date: |
Fri, 14 Aug 2020 05:13:24 -0400 |
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 dd2cffc6aa..f9f223cdfd 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')
--
2.26.2
- [PATCH 132/150] meson: cpu-emu, (continued)
- [PATCH 132/150] meson: cpu-emu, Paolo Bonzini, 2020/08/14
- [PATCH 133/150] meson: plugins, Paolo Bonzini, 2020/08/14
- [PATCH 138/150] meson: sphinx-build, Paolo Bonzini, 2020/08/14
- [PATCH 139/150] docs: automatically track manual dependencies, Paolo Bonzini, 2020/08/14
- [PATCH 137/150] remove Makefile.target, Paolo Bonzini, 2020/08/14
- [PATCH 141/150] meson: convert check-block, Paolo Bonzini, 2020/08/14
- [PATCH 144/150] meson: convert sample plugins, Paolo Bonzini, 2020/08/14
- [PATCH 145/150] meson: move SDL and SDL-image detection to meson, Paolo Bonzini, 2020/08/14
- [PATCH 140/150] meson: build texi doc, Paolo Bonzini, 2020/08/14
- [PATCH 146/150] meson: convert VNC and dependent libraries to meson, Paolo Bonzini, 2020/08/14
- [PATCH 148/150] meson: avoid unstable module warning with Meson 0.56.0 or newer,
Paolo Bonzini <=
- [PATCH 143/150] meson: replace create-config with meson configure_file, Paolo Bonzini, 2020/08/14
- [PATCH 147/150] meson: convert po/, Paolo Bonzini, 2020/08/14
- [PATCH 150/150] docs: convert build system documentation to rST, Paolo Bonzini, 2020/08/14
- [PATCH 142/150] rules.mak: drop unneeded macros, Paolo Bonzini, 2020/08/14
- [PATCH 149/150] meson: update build-system documentation, Paolo Bonzini, 2020/08/14
- Re: [PATCH v2 000/150] Meson integration for 5.2, no-reply, 2020/08/14
- Re: [PATCH v2 000/150] Meson integration for 5.2, no-reply, 2020/08/14
- Re: [PATCH v2 000/150] Meson integration for 5.2, no-reply, 2020/08/14
- Re: [PATCH v2 000/150] Meson integration for 5.2, Howard Spoelstra, 2020/08/15
- Re: [PATCH v2 000/150] Meson integration for 5.2, Roman Bolshakov, 2020/08/17