From 4c76635e1f19c6d1919d4ea94f6b00f97b996665 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 29 Apr 2018 18:18:07 +0100 Subject: meson: Add option for installing tests Like the Autotools build allows us to decide whether the tests should be installed in a known location, we should have this option for the Meson build. --- meson_options.txt | 4 ++++ tests/meson.build | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index a5aa93be0..9f6b6505e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -42,3 +42,7 @@ option('native_windows_loaders', description: 'Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option', type: 'boolean', value: false) +option('installed_tests', + description: 'Install the test suite', + type: 'boolean', + value: true) diff --git a/tests/meson.build b/tests/meson.build index c99336018..e134c3290 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -89,8 +89,10 @@ test_data = [ installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name()) -install_data(test_data, install_dir: installed_test_bindir) -install_subdir('test-images', install_dir: installed_test_bindir) +if get_option('installed_tests') + install_data(test_data, install_dir: installed_test_bindir) + install_subdir('test-images', install_dir: installed_test_bindir) +endif test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep ] @@ -110,7 +112,7 @@ foreach t: installed_tests '--testbin=@0@'.format(test_name), '@OUTPUT@', ], - install: true, + install: get_option('installed_tests'), install_dir: installed_test_datadir, ) @@ -121,7 +123,7 @@ foreach t: installed_tests gdk_pixbuf_inc, ], c_args: common_cflags, - install: true, + install: get_option('installed_tests'), install_dir: installed_test_bindir, ) -- cgit v1.2.1