diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2022-06-01 10:07:40 +0000 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2022-06-01 10:07:40 +0000 |
| commit | aedf77e7f91498b41298f40d676de0adb974cb85 (patch) | |
| tree | ad65efd4e1c43c9713708066e453cbbe138dc0e0 | |
| parent | 340872d8cbda8d654e419463d2cacfb621446457 (diff) | |
| parent | 55fab982e34db0f21cdb145246a9806abb6ec958 (diff) | |
| download | libmediaart-aedf77e7f91498b41298f40d676de0adb974cb85.tar.gz | |
Merge branch 'master' into 'master'
meson: add unit_tests option
See merge request GNOME/libmediaart!16
| -rw-r--r-- | libmediaart/meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | tests/meson.build | 14 |
3 files changed, 11 insertions, 7 deletions
diff --git a/libmediaart/meson.build b/libmediaart/meson.build index 74aa4df..4f1201c 100644 --- a/libmediaart/meson.build +++ b/libmediaart/meson.build @@ -30,7 +30,7 @@ marshal = gnome.genmarshal('marshal', libmediaart_dependencies = [glib, gio_unix, gobject, image_library] -libmediaart = shared_library( +libmediaart = library( 'mediaart-' + libmediaart_api_version, libmediaart_sources, marshal[0], marshal[1], version: libmediaart_ltversion, diff --git a/meson_options.txt b/meson_options.txt index c97c054..3146b1f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,8 @@ option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'q option('introspection', type : 'boolean', value : 'true', description : 'Enable / disable the GObject-Introspection integration') option('vapi', type : 'boolean', value : 'true') +option('tests', type : 'boolean', value : 'true', + description : 'Enable / disable unit tests') option('gtk_doc', type: 'boolean', value: 'false', diff --git a/tests/meson.build b/tests/meson.build index 28834c0..2e7ddf1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,7 +1,9 @@ -mediaart_test = executable('mediaart-test', - 'mediaarttest.c', - dependencies: libmediaart_dep, -) +if get_option('tests') + mediaart_test = executable('mediaart-test', + 'mediaarttest.c', + dependencies: libmediaart_dep, + ) -test('mediaart', mediaart_test, - env: 'G_TEST_SRCDIR=' + meson.current_source_dir()) + test('mediaart', mediaart_test, + env: 'G_TEST_SRCDIR=' + meson.current_source_dir()) +endif |