diff options
| author | Paolo Bonzini | 2021-06-03 11:31:35 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-07-06 08:33:51 +0200 |
| commit | e36e8c70f6d3ed844f4606f3f019d2ae808f0af1 (patch) | |
| tree | 7e32b6d5994f1f5e79a60d2ab1657d76f3156ebc /meson.build | |
| parent | configure, meson: convert libdaxctl detection to meson (diff) | |
| download | qemu-e36e8c70f6d3ed844f4606f3f019d2ae808f0af1.tar.gz qemu-e36e8c70f6d3ed844f4606f3f019d2ae808f0af1.tar.xz qemu-e36e8c70f6d3ed844f4606f3f019d2ae808f0af1.zip | |
configure, meson: convert libpmem detection to meson
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build index e530829105..e301eda3a5 100644 --- a/meson.build +++ b/meson.build @@ -1006,9 +1006,9 @@ if not get_option('libusb').auto() or have_system endif libpmem = not_found -if 'CONFIG_LIBPMEM' in config_host - libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(), - link_args: config_host['LIBPMEM_LIBS'].split()) +if not get_option('libpmem').auto() or have_system + libpmem = dependency('libpmem', required: get_option('libpmem'), + method: 'pkg-config', kwargs: static_kwargs) endif libdaxctl = not_found if not get_option('libdaxctl').auto() or have_system @@ -2822,7 +2822,7 @@ summary_info += {'zstd support': zstd.found()} summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')} summary_info += {'libxml2': config_host.has_key('CONFIG_LIBXML2')} summary_info += {'capstone': capstone_opt == 'disabled' ? false : capstone_opt} -summary_info += {'libpmem support': config_host.has_key('CONFIG_LIBPMEM')} +summary_info += {'libpmem support': libpmem.found()} summary_info += {'libdaxctl support': libdaxctl.found()} summary_info += {'libudev': libudev.found()} summary_info += {'FUSE lseek': fuse_lseek.found()} |