meson: tllist/fcft: use system dependency first, fallback to subprojects

This commit is contained in:
Daniel Eklöf 2019-12-01 16:11:35 +01:00
parent ba56379055
commit fcea49920f
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F

View file

@ -25,6 +25,9 @@ wayland_client = dependency('wayland-client')
wayland_cursor = dependency('wayland-cursor')
xkb = dependency('xkbcommon')
tllist = dependency('tllist', fallback: ['tllist', 'tllist'])
fcft = dependency('fcft', fallback: ['fcft', 'fcft'])
wayland_protocols_datadir = wayland_protocols.get_pkgconfig_variable('pkgdatadir')
wscanner = dependency('wayland-scanner', native: true)
@ -60,20 +63,6 @@ version = custom_target(
output: 'version.h',
command: [generate_version_sh, meson.project_version(), '@SOURCE_DIR@', '@OUTPUT@'])
tllist_proj = subproject('tllist', required: false)
if tllist_proj.found()
tllist = tllist_proj.get_variable('tllist')
else
tllist = dependency('tllist')
endif
fcft_proj = subproject('fcft', required: false)
if fcft_proj.found()
fcft = fcft_proj.get_variable('fcft')
else
fcft = dependency('fcft')
endif
executable(
'foot',
'async.c', 'async.h',