summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2020-01-13 12:20:55 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2020-01-13 12:20:55 +0000
commit0ce64cc440d4e3e34235097f868c81a21c3fe4c3 (patch)
tree62da2031a7e257ddcae8378ce3bdf727bdc0da96
parent477417f996aeb6a64db6735959f0cae0ee701a7f (diff)
parent8e835f8ed2299ad68032432eaf6491b2da8d532b (diff)
downloadjson-glib-0ce64cc440d4e3e34235097f868c81a21c3fe4c3.tar.gz
Merge branch 'dab_add_conditional_tests' into 'master'
meson: add tests option See merge request GNOME/json-glib!19
-rw-r--r--json-glib/meson.build4
-rw-r--r--meson_options.txt3
2 files changed, 6 insertions, 1 deletions
diff --git a/json-glib/meson.build b/json-glib/meson.build
index 035e954..e77f818 100644
--- a/json-glib/meson.build
+++ b/json-glib/meson.build
@@ -140,4 +140,6 @@ foreach t: tools
install: true)
endforeach
-subdir('tests')
+if get_option('tests')
+ subdir('tests')
+endif
diff --git a/meson_options.txt b/meson_options.txt
index a6b2a51..068a03f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,3 +7,6 @@ option('gtk_doc',
option('man',
type: 'boolean', value: false,
description: 'Build the man pages (requires xsltproc)')
+option('tests',
+ type: 'boolean', value: true,
+ description: 'Build the tests')