Commit 51775779 authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜

meson: Use feature option for tests option

This was somehow missed the last time around.
parent 8a7f5cfe
......@@ -116,6 +116,11 @@ gstapp_dep = dependency('gstreamer-app-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'app_dep'])
gstnet_dep = dependency('gstreamer-net-1.0', version : gst_req,
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'))
gnome = import('gnome')
......@@ -134,7 +139,7 @@ if get_option('default_library') == 'shared'
endif
subdir('gst')
if get_option('tests')
if not get_option('tests').disabled()
subdir('tests')
endif
if not get_option('examples').disabled()
......
......@@ -5,7 +5,7 @@ option('package-name', type : 'string', yield : true,
option('package-origin', type : 'string',
value : 'Unknown package origin', yield : true,
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')
option('examples', type : 'feature', value : 'auto', yield : true,
description : 'Build the examples')
# 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 = []
if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version, required : false)
......
if host_machine.system() != 'windows'
# FIXME: make check work on windows
if host_machine.system() != 'windows' and gstcheck_dep.found()
subdir('check')
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment