]> git.mdlowis.com Git - proto/labwc.git/commitdiff
meson.build: require wlroots ['>=0.14.0', '<0.15.0']
authorJohan Malm <jgm323@gmail.com>
Sat, 17 Apr 2021 13:26:25 +0000 (14:26 +0100)
committerJohan Malm <jgm323@gmail.com>
Sat, 17 Apr 2021 13:26:25 +0000 (14:26 +0100)
Also specify required version when using wlroots as subproject

meson.build

index 061508dbdb34fca561d12fc575afca7be043c97b..a28769d7879c135f3e6bc05336c1bbda08008e7e 100644 (file)
@@ -36,10 +36,12 @@ if git.found()
 endif
 add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c')
 
+wlroots_version = ['>=0.14.0', '<0.15.0']
 wlroots_proj = subproject(
   'wlroots',
   default_options: ['examples=false'],
   required: false,
+  version: wlroots_version,
 )
 
 if wlroots_proj.found()
@@ -47,7 +49,7 @@ if wlroots_proj.found()
   wlroots_conf = wlroots_proj.get_variable('conf_data')
   wlroots_has_xwayland = wlroots_conf.get('WLR_HAS_XWAYLAND') == 1
 else
-  wlroots       = dependency('wlroots', version: ['>=0.13.0', '<0.14.0'])
+  wlroots       = dependency('wlroots', version: wlroots_version)
   wlroots_has_xwayland = cc.get_define('WLR_HAS_XWAYLAND', prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1'
 endif
 wayland_server  = dependency('wayland-server', version: '>=1.19.0')