diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-11-25 14:06:37 +0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2020-12-08 13:48:58 -0500 |
commit | 0df750e9d3a5fea5e19f4750582121c9293a9d71 (patch) | |
tree | d1333e36fdf7bc7d8e5dbbbc8c7398748d6a2756 /contrib/vhost-user-gpu | |
parent | 3d22bd27acd93281354b10c6bf787b720685eb80 (diff) | |
download | qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.zip qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.tar.gz qemu-0df750e9d3a5fea5e19f4750582121c9293a9d71.tar.bz2 |
libvhost-user: make it a meson subproject
By making libvhost-user a subproject, check it builds
standalone (without the global QEMU cflags etc).
Note that the library still relies on QEMU include/qemu/atomic.h and
linux_headers/.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201125100640.366523-6-marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'contrib/vhost-user-gpu')
-rw-r--r-- | contrib/vhost-user-gpu/meson.build | 3 | ||||
-rw-r--r-- | contrib/vhost-user-gpu/vugpu.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build index c487ca7..2fc2320 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -2,8 +2,7 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in config_host \ and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host \ and pixman.found() executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm.c'), - link_with: libvhost_user, - dependencies: [qemuutil, pixman, gbm, virgl], + dependencies: [qemuutil, pixman, gbm, virgl, vhost_user], install: true, install_dir: get_option('libexecdir')) diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugpu.h index 3153c9a..bdf9a74 100644 --- a/contrib/vhost-user-gpu/vugpu.h +++ b/contrib/vhost-user-gpu/vugpu.h @@ -17,7 +17,7 @@ #include "qemu/osdep.h" -#include "contrib/libvhost-user/libvhost-user-glib.h" +#include "libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h" #include "qemu/queue.h" |