[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/51] meson: do not unnecessarily use cmake for dependencies
From: |
Paolo Bonzini |
Subject: |
[PULL 20/51] meson: do not unnecessarily use cmake for dependencies |
Date: |
Thu, 7 Sep 2023 14:59:29 +0200 |
Both gvnc and sysprof-capture come with pkg-config files, so specify
the method to find them.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/migration/meson.build | 2 +-
tests/qtest/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/migration/meson.build b/tests/migration/meson.build
index ac71f132901..a91aa61c659 100644
--- a/tests/migration/meson.build
+++ b/tests/migration/meson.build
@@ -1,4 +1,4 @@
-sysprof = dependency('sysprof-capture-4', required: false)
+sysprof = dependency('sysprof-capture-4', method: 'pkg-config', required:
false)
glib_static = dependency('glib-2.0', version: glib_req_ver, required: false,
method: 'pkg-config', static: true)
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index b071d400b37..df63909ee51 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -321,7 +321,7 @@ qtests = {
}
if vnc.found()
- gvnc = dependency('gvnc-1.0', required: false)
+ gvnc = dependency('gvnc-1.0', method: 'pkg-config', required: false)
if gvnc.found()
qtests += {'vnc-display-test': [gvnc]}
qtests_generic += [ 'vnc-display-test' ]
--
2.41.0
- [PULL 09/51] os-posix.c, softmmu/vl.c: move os_parse_cmd_args() into qemu_init(), (continued)
- [PULL 09/51] os-posix.c, softmmu/vl.c: move os_parse_cmd_args() into qemu_init(), Paolo Bonzini, 2023/09/07
- [PULL 14/51] contrib/plugins: remove -soname argument, Paolo Bonzini, 2023/09/07
- [PULL 07/51] os-posix.c: create and export os_set_runas(), Paolo Bonzini, 2023/09/07
- [PULL 12/51] softmmu/vl.c: inline include/qemu/qemu-options.h into vl.c, Paolo Bonzini, 2023/09/07
- [PULL 15/51] contrib/plugins/cache: Fix string format, Paolo Bonzini, 2023/09/07
- [PULL 17/51] contrib/plugins/howvec: Fix string format, Paolo Bonzini, 2023/09/07
- [PULL 16/51] contrib/plugins/drcov: Fix string format, Paolo Bonzini, 2023/09/07
- [PULL 21/51] meson: update unsupported host/CPU messages, Paolo Bonzini, 2023/09/07
- [PULL 25/51] configure: remove boolean variables for targets, Paolo Bonzini, 2023/09/07
- [PULL 11/51] os-posix.c: remove unneeded #includes, Paolo Bonzini, 2023/09/07
- [PULL 20/51] meson: do not unnecessarily use cmake for dependencies,
Paolo Bonzini <=
- [PULL 24/51] meson: compile bundled device trees, Paolo Bonzini, 2023/09/07
- Re: [PULL 24/51] meson: compile bundled device trees, Philippe Mathieu-Daudé, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, Michael Tokarev, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, BALATON Zoltan, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, Michael Tokarev, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, BALATON Zoltan, 2023/09/08
- Re: [PULL 24/51] meson: compile bundled device trees, Philippe Mathieu-Daudé, 2023/09/11
- Re: [PULL 24/51] meson: compile bundled device trees, Peter Maydell, 2023/09/11
[PULL 13/51] util/async-teardown.c: move to softmmu/, only build it when system build is requested, Paolo Bonzini, 2023/09/07
[PULL 18/51] contrib/plugins/lockstep: Fix string format, Paolo Bonzini, 2023/09/07