mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 21:47:18 +00:00
meson: prefix kvm_dep, m_dep and util_dep with lib
We don't use the lib prefix for all libraries but in these cases it makes sense to use the prefix. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
parent
b3e2ef408b
commit
4b98a703ee
@ -1066,9 +1066,9 @@ gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version)
|
|||||||
|
|
||||||
# Check for BSD kvm (kernel memory interface)
|
# Check for BSD kvm (kernel memory interface)
|
||||||
if host_machine.system() == 'freebsd'
|
if host_machine.system() == 'freebsd'
|
||||||
kvm_dep = cc.find_library('kvm')
|
libkvm_dep = cc.find_library('kvm')
|
||||||
else
|
else
|
||||||
kvm_dep = dependency('', required: false)
|
libkvm_dep = dependency('', required: false)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libiscsi_version = '1.18.0'
|
libiscsi_version = '1.18.0'
|
||||||
@ -1160,7 +1160,7 @@ endif
|
|||||||
libxml_version = '2.9.1'
|
libxml_version = '2.9.1'
|
||||||
libxml_dep = dependency('libxml-2.0', version: '>=' + libxml_version)
|
libxml_dep = dependency('libxml-2.0', version: '>=' + libxml_version)
|
||||||
|
|
||||||
m_dep = cc.find_library('m', required : false)
|
libm_dep = cc.find_library('m', required : false)
|
||||||
|
|
||||||
netcf_version = '0.1.8'
|
netcf_version = '0.1.8'
|
||||||
netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: get_option('netcf'))
|
netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: get_option('netcf'))
|
||||||
@ -1372,7 +1372,7 @@ if udev_dep.found()
|
|||||||
conf.set('WITH_UDEV', 1)
|
conf.set('WITH_UDEV', 1)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
util_dep = cc.find_library('util', required: false)
|
libutil_dep = cc.find_library('util', required: false)
|
||||||
|
|
||||||
if host_machine.system() == 'windows'
|
if host_machine.system() == 'windows'
|
||||||
ole32_dep = cc.find_library('ole32')
|
ole32_dep = cc.find_library('ole32')
|
||||||
|
@ -21,9 +21,9 @@ if conf.has('WITH_BHYVE')
|
|||||||
],
|
],
|
||||||
dependencies: [
|
dependencies: [
|
||||||
access_dep,
|
access_dep,
|
||||||
kvm_dep,
|
libkvm_dep,
|
||||||
|
libutil_dep,
|
||||||
src_dep,
|
src_dep,
|
||||||
util_dep,
|
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
conf_inc_dir,
|
conf_inc_dir,
|
||||||
|
@ -187,13 +187,13 @@ virt_util_lib = static_library(
|
|||||||
devmapper_dep,
|
devmapper_dep,
|
||||||
gnutls_dep,
|
gnutls_dep,
|
||||||
intl_dep,
|
intl_dep,
|
||||||
|
libm_dep,
|
||||||
libnl_dep,
|
libnl_dep,
|
||||||
m_dep,
|
libutil_dep,
|
||||||
numactl_dep,
|
numactl_dep,
|
||||||
secdriver_dep,
|
secdriver_dep,
|
||||||
src_dep,
|
src_dep,
|
||||||
thread_dep,
|
thread_dep,
|
||||||
util_dep,
|
|
||||||
win32_dep,
|
win32_dep,
|
||||||
yajl_dep,
|
yajl_dep,
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user