From 1b0be1d5bea76c1d02a7afebc431844e933ed4a8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 1 Jun 2022 06:48:23 +0000 Subject: meson: add tests option Signed-off-by: Fabrice Fontaine --- meson_options.txt | 2 ++ tests/meson.build | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) 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 -- cgit v1.2.1 From 55fab982e34db0f21cdb145246a9806abb6ec958 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Dec 2021 20:14:54 +0100 Subject: libmediaart/meson.build: replace shared_library Use library() to make building a static or dynamic library optional depending on the builtin "default_library" meson option. Fixes failures when using the library statically: /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libc.a(__uClibc_main.os): in function `__uClibc_fini': __uClibc_main.c:(.text+0x15c): undefined reference to `__fini_array_start' Signed-off-by: Fabrice Fontaine --- libmediaart/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- cgit v1.2.1