diff --git a/meson.build b/meson.build index 47413859..b14e5429 100644 --- a/meson.build +++ b/meson.build @@ -37,22 +37,14 @@ if git.found() endif add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c') -wlroots_version = ['>=0.16.0', '<0.17.0'] -wlroots_proj = subproject( +wlroots = dependency( 'wlroots', default_options: ['default_library=static', 'examples=false'], - required: false, - version: wlroots_version, + version: ['>=0.16.0', '<0.17.0'], ) -if wlroots_proj.found() - wlroots = wlroots_proj.get_variable('wlroots') - wlroots_conf = wlroots_proj.get_variable('conf_data') - wlroots_has_xwayland = wlroots_conf.get('WLR_HAS_XWAYLAND') == 1 -else - wlroots = dependency('wlroots', version: wlroots_version) - wlroots_has_xwayland = cc.get_define('WLR_HAS_XWAYLAND', prefix: '#include ', dependencies: wlroots) == '1' -endif +wlroots_has_xwayland = wlroots.get_variable('have_xwayland') == 'true' + wayland_server = dependency('wayland-server', version: '>=1.19.0') wayland_protos = dependency('wayland-protocols') xkbcommon = dependency('xkbcommon') diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap index 3507ea52..f674a834 100644 --- a/subprojects/wlroots.wrap +++ b/subprojects/wlroots.wrap @@ -1,3 +1,6 @@ [wrap-git] url = https://gitlab.freedesktop.org/wlroots/wlroots.git revision = 640f3b9f2156a007c5d1a36afdee570e123c95e4 + +[provide] +dependency_names = wlroots