aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-03-15 16:11:38 -0400
committerGitHub <noreply@github.com>2018-03-15 16:11:38 -0400
commit75230fdc2b5c45b762e5a68c500a7c5076c19091 (patch)
treeaf6d2d8d7b660584bf3cf16e72bf50d6e6a6e1f1
parent1dca041513105e966c40197da8518c6abea9a79c (diff)
parentbb173672ae1677967ebbe39facb432d06dccd884 (diff)
downloadsway-75230fdc2b5c45b762e5a68c500a7c5076c19091.tar.xz
Merge pull request #1622 from emersion/wlroots-subproject-fallback
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')