From 04659825a64ad455610dedc98e1762d6bbb35325 Mon Sep 17 00:00:00 2001 From: Andri Yngvason Date: Mon, 30 Nov 2020 21:19:10 +0000 Subject: [PATCH] meson: Make it possible to build libvncclient as subproject --- meson.build | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8a4a8d8..dd824d6 100644 --- a/meson.build +++ b/meson.build @@ -8,6 +8,8 @@ project( ], ) +cmake = import('cmake') + buildtype = get_option('buildtype') host_system = host_machine.system() prefix = get_option('prefix') @@ -31,7 +33,13 @@ xkbcommon = dependency('xkbcommon') pixman = dependency('pixman-1') wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') -libvncclient = dependency('libvncclient') + +libvncserver_project = cmake.subproject('libvncserver') +if libvncserver_project.found() + libvncclient = libvncserver_project.dependency('vncclient') +else + libvncclient = dependency('libvncclient') +endif aml_project = subproject('aml', required: false) if aml_project.found()