~sircmpwn/wio

Prefer wlroots subproject v1 PROPOSED

Bill Doyle: 1
 Prefer wlroots subproject

 1 files changed, 12 insertions(+), 1 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~sircmpwn/wio/patches/4605/mbox | git am -3
Learn more about email & git

[PATCH] Prefer wlroots subproject Export this patch

---
Allows building even if "stable" wlroots is installed systemwide. (I 
cribbed this from sway, just removed the version checks.)

 meson.build | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 656611c..bc35d47 100644
--- a/meson.build
+++ b/meson.build
@@ -23,9 +23,20 @@ add_project_arguments(

cc = meson.get_compiler('c')

# Prefer wlroots subproject if it is available.
wlroots_proj = subproject(
	'wlroots',
	default_options: ['rootston=false', 'examples=false'],
	required: false,
)
if wlroots_proj.found()
	wlroots = wlroots_proj.get_variable('wlroots')
else
	wlroots = dependency('wlroots')
endif

cairo = dependency('cairo')
math = cc.find_library('m')
wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
wayland_server = dependency('wayland-server')
wayland_protos = dependency('wayland-protocols')
xkbcommon = dependency('xkbcommon')
-- 
2.21.0
Thanks!

To git.sr.ht:~sircmpwn/wio
   d304f66..df1c12f  master -> master
View this thread in the archives