mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Use feature option for tests option

Browse source 
This was somehow missed the last time around.
This commit is contained in:
Nirbheek Chauhan 2018-09-01 11:21:15 +05:30
parent 8a7f5cfe5f
commit 517757791e
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
meson.build
View file

@ -116,6 +116,11 @@ gstapp_dep = dependency('gstreamer-app-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'app_dep']) fallback : ['gst-plugins-base', 'app_dep'])
gstnet_dep = dependency('gstreamer-net-1.0', version : gst_req, gstnet_dep = dependency('gstreamer-net-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_net_dep']) fallback : ['gstreamer', 'gst_net_dep'])
if host_machine.system() != 'windows'
gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
required : get_option('tests'),
fallback : ['gstreamer', 'gst_check_dep'])
endif
gir = find_program('g-ir-scanner', required : get_option('introspection')) gir = find_program('g-ir-scanner', required : get_option('introspection'))
gnome = import('gnome') gnome = import('gnome')
@ -134,7 +139,7 @@ if get_option('default_library') == 'shared'
endif endif
subdir('gst') subdir('gst')
if get_option('tests') if not get_option('tests').disabled()
subdir('tests') subdir('tests')
endif endif
if not get_option('examples').disabled() if not get_option('examples').disabled()

2
meson_options.txt
View file

@ -5,7 +5,7 @@ option('package-name', type : 'string', yield : true,
option('package-origin', type : 'string', option('package-origin', type : 'string',
value : 'Unknown package origin', yield : true, value : 'Unknown package origin', yield : true,
description : 'package origin URL to use in plugins') description : 'package origin URL to use in plugins')
option('tests', type : 'boolean', value : true, option('tests', type : 'feature', value : 'auto', yield : true,
description : 'Build and enable unit tests') description : 'Build and enable unit tests')
option('examples', type : 'feature', value : 'auto', yield : true, option('examples', type : 'feature', value : 'auto', yield : true,
description : 'Build the examples') description : 'Build the examples')

4
tests/check/meson.build
View file

@ -1,8 +1,4 @@
# FIXME: something is wrong with plugin paths / whitelisting here # FIXME: something is wrong with plugin paths / whitelisting here
gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep'])
pluginsdirs = [] pluginsdirs = []
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version, required : false) pbase = dependency('gstreamer-plugins-base-' + api_version, required : false)

3
tests/meson.build
View file

@ -1,4 +1,5 @@
if host_machine.system() != 'windows' # FIXME: make check work on windows
if host_machine.system() != 'windows' and gstcheck_dep.found()
subdir('check') subdir('check')
endif endif