diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2022-05-12 22:31:37 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-05-12 22:31:37 +0000 |
commit | 626880137cbb2ddcdb08dcb44b86597971bdec2f (patch) | |
tree | 38c243c392abb6c40d9e59c4fbbc61ec197b88d5 | |
parent | f61618b4cc053d957a8eae8179a00728eefda79b (diff) | |
parent | 801eef111df624f4377baed9a90c94b6a2d4340c (diff) | |
download | gdk-pixbuf-626880137cbb2ddcdb08dcb44b86597971bdec2f.tar.gz |
Merge branch 'meson-build-tests' into 'master'
meson: add build_tests option
See merge request GNOME/gdk-pixbuf!132
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | meson_options.txt | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/meson.build b/meson.build index aab4017ca..ed82464e4 100644 --- a/meson.build +++ b/meson.build @@ -414,7 +414,9 @@ subdir('gdk-pixbuf') subdir('po') if not meson.is_cross_build() - subdir('tests') + if get_option('tests') + subdir('tests') + endif subdir('thumbnailer') endif @@ -446,6 +448,7 @@ summary('Introspection', build_gir, section: 'Build') summary('Documentation', build_docs, section: 'Build') summary('Manual pages', get_option('man'), section: 'Build') summary('Relocatable', get_option('relocatable'), section: 'Build') +summary('Build tests', get_option('tests'), section: 'Build') summary('Installed tests', get_option('installed_tests'), section: 'Build') summary('prefix', gdk_pixbuf_prefix, section: 'Directories') diff --git a/meson_options.txt b/meson_options.txt index c12179c5e..0ea94eb47 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -41,6 +41,10 @@ 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('tests', + description: 'Build the test suite', + type: 'boolean', + value: true) option('installed_tests', description: 'Install the test suite', type: 'boolean', |