Merge branch 'devel' into 'master'

Entry test added to -devel package

See merge request Librem5/squeekboard!286
This commit is contained in:
Dorota Czaplejewicz
2019-12-23 21:33:41 +00:00
7 changed files with 27 additions and 15 deletions

View File

@ -112,16 +112,3 @@ squeekboard = executable('squeekboard',
'-DEEK_COMPILATION=1'],
)
bindir = join_paths(prefix, get_option('bindir'))
test_layout = custom_target('squeekboard-test-layout',
build_by_default: true,
# meson doesn't track all inputs, cargo does
build_always_stale: true,
output: ['squeekboard-test-layout'],
console: true,
command: [cargo_build] + cargo_build_flags
+ ['--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout'],
install: true,
install_dir: bindir,
)