diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-12-01 15:11:35 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-12-01 15:11:35 +0000 |
| commit | fcea49920fdd523f71dfe273a370bb838225c982 (patch) | |
| tree | cb24aed45310972d783d95fb5042cce07e46192a | |
| parent | meson/PKGBUILD: we no longer depend directly on fontconfig/freetype (diff) | |
meson: tllist/fcft: use system dependency first, fallback to subprojects
| -rw-r--r-- | meson.build | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/meson.build b/meson.build index 1f67599b..a5f20aaf 100644 --- a/meson.build +++ b/meson.build @@ -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', |
