tllist: add git submodule directly under subprojects

Meson now falls back to a system dependency if the subproject isn't
available.
This commit is contained in:
Daniel Eklöf 2019-12-01 15:51:57 +01:00
parent 3f663a0e6f
commit 75d9c9a12d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 10 additions and 1 deletions

3
.gitmodules vendored
View file

@ -2,3 +2,6 @@
path = external/wlr-protocols path = external/wlr-protocols
url = https://github.com/swaywm/wlr-protocols.git url = https://github.com/swaywm/wlr-protocols.git
branch = master branch = master
[submodule "subprojects/tllist"]
path = subprojects/tllist
url = https://codeberg.org/dnkl/tllist.git

View file

@ -57,7 +57,12 @@ if backend_x11
install_headers('xcb.h', subdir: 'yambar') install_headers('xcb.h', subdir: 'yambar')
endif endif
tllist = subproject('tllist').get_variable('tllist') tllist_proj = subproject('tllist', required: false)
if tllist_proj.found()
tllist = tllist_proj.get_variable('tllist')
else
tllist = dependency('tllist')
endif
subdir('completions') subdir('completions')
subdir('doc') subdir('doc')

1
subprojects/tllist Submodule

@ -0,0 +1 @@
Subproject commit 5054d3dbbbd7d76e35f9d0d875e3c7f500fde52b