aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-03-12 12:21:46 +0100
committeremersion <contact@emersion.fr>2018-03-15 21:02:06 +0100
commitbb173672ae1677967ebbe39facb432d06dccd884 (patch)
tree7e0a7850ac5558cba6aca42924cd8627b0f62c9b
parent3035db74df147aa5fe7252a626c8c767e5e30631 (diff)
meson: allow wlroots to be a subproject
-rw-r--r--.gitignore1
-rw-r--r--meson.build2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b6e56f7a..f48e22e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ build/
.lvimrc
config-debug
wayland-*-protocol.*
+/subprojects/wlroots
diff --git a/meson.build b/meson.build
index fc995c81..f27ac451 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@ prefix = get_option('prefix')
jsonc = dependency('json-c', version: '>=0.13')
pcre = dependency('libpcre')
-wlroots = dependency('wlroots')
+wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
wayland_server = dependency('wayland-server')
wayland_client = dependency('wayland-client')
wayland_egl = dependency('wayland-egl')