wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meson: Rearrange lines & check for Skopeo

Browse source 
Skopeo is now a dependency for running system tests[0]. It is not a hard
dependency but at least give the user a heads-up.

https://github.com/containers/toolbox/pull/732
This commit is contained in:
Ondřej Míchal 2021-03-21 22:58:23 +01:00
parent 424691b404
commit 7e60e89086
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
meson.build
View file

@ -13,10 +13,12 @@ add_project_link_arguments('-pthread', language: 'c')
go = find_program('go')
go_md2man = find_program('go-md2man')
shellcheck = find_program('shellcheck', required: false)
profiledir = get_option('profile_dir')
skopeo = find_program('skopeo', required: false)
systemd_dep = dependency('systemd')
bash_completion = dependency('bash-completion', required: false)
profiledir = get_option('profile_dir')
tmpfilesdir = systemd_dep.get_pkgconfig_variable('tmpfilesdir')
toolbox = files('toolbox')
@ -25,7 +27,6 @@ if shellcheck.found()
test('shellcheck', shellcheck, args: [toolbox])
endif
bash_completion = dependency('bash-completion', required: false)
if bash_completion.found()
install_data(
'completion/bash/toolbox',
@ -33,6 +34,10 @@ if bash_completion.found()
)
endif
if not skopeo.found()
message('Running system tests requires Skopeo for OCI image manipulation.')
endif
install_subdir(
'test',
install_dir: join_paths(get_option('datadir'), meson.project_name())