Merge pull request #1622 from emersion/wlroots-subproject-fallback

meson: allow wlroots to be a subproject
This commit is contained in:
Drew DeVault 2018-03-15 16:11:38 -04:00 committed by GitHub
commit 75230fdc2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View file

@ -8,3 +8,4 @@ build/
.lvimrc .lvimrc
config-debug config-debug
wayland-*-protocol.* wayland-*-protocol.*
/subprojects/wlroots

View file

@ -21,7 +21,7 @@ prefix = get_option('prefix')
jsonc = dependency('json-c', version: '>=0.13') jsonc = dependency('json-c', version: '>=0.13')
pcre = dependency('libpcre') pcre = dependency('libpcre')
wlroots = dependency('wlroots') wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
wayland_client = dependency('wayland-client') wayland_client = dependency('wayland-client')
wayland_egl = dependency('wayland-egl') wayland_egl = dependency('wayland-egl')