From ebcf3f5f632c8ddd0d2face4402f35759b61a13e Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 17 Aug 2018 00:27:59 +0530 Subject: [PATCH] meson: Add an option for tests This is needed because we don't always have gstreamer-check available, for instance inside Cerbero on iOS. --- meson.build | 5 +++-- meson_options.txt | 1 + tests/meson.build | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index d3fea42..6be8347 100644 --- a/meson.build +++ b/meson.build @@ -211,12 +211,13 @@ gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req, fallback : ['gstreamer', 'gst_base_dep']) gstnet_dep = dependency('gstreamer-net-1.0', version : gst_req, fallback : ['gstreamer', 'gst_net_dep']) +gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, + fallback : ['gstreamer', 'gst_controller_dep']) if host_system != 'windows' gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req, + required : get_option('tests'), fallback : ['gstreamer', 'gst_check_dep']) endif -gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, - fallback : ['gstreamer', 'gst_controller_dep']) gstpbutils_dep = dependency('gstreamer-pbutils-1.0', version : gst_req, fallback : ['gst-plugins-base', 'pbutils_dep']) diff --git a/meson_options.txt b/meson_options.txt index 8c10e55..a3b5cd8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -80,6 +80,7 @@ option('v4l2-gudev', type : 'feature', value : 'auto', description : 'Use libgud # Common feature options option('examples', type : 'feature', value : 'auto', yield : true) +option('tests', type : 'feature', value : 'auto', yield : true) option('nls', type : 'feature', value : 'auto', yield: true, description : 'Enable native language support (translations)') option('orc', type : 'feature', value : 'auto', yield : true) diff --git a/tests/meson.build b/tests/meson.build index 6649601..55d144f 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,6 +1,8 @@ # FIXME: make check work on windows -if host_machine.system() != 'windows' -subdir('check') +if host_system != 'windows' + if not get_option('tests').disabled() and gstcheck_dep.found() + subdir('check') + endif endif subdir('icles') -- 2.7.4