From 7e60e89086691ebcf6d877125ee6c162fa2d9fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20M=C3=ADchal?= Date: Sun, 21 Mar 2021 22:58:23 +0100 Subject: [PATCH] meson: Rearrange lines & check for Skopeo 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 --- meson.build | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 00bac27..c0ea877 100644 --- a/meson.build +++ b/meson.build @@ -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())