Meson: Change extra-checks to feature option and make it yielding

This commit is contained in:
Xavier Claessens 2020-04-08 12:09:10 -04:00 committed by GStreamer Merge Bot
parent e94ad24b9f
commit c18f9d4ad4
2 changed files with 2 additions and 2 deletions

View file

@ -436,7 +436,7 @@ test_deps = [gmp_dep, gsl_dep, gslcblas_dep]
# Used by gstinfo.c # Used by gstinfo.c
dl_dep = cc.find_library('dl', required : false) dl_dep = cc.find_library('dl', required : false)
cdata.set('HAVE_DLADDR', cc.has_function('dladdr', dependencies : dl_dep)) cdata.set('HAVE_DLADDR', cc.has_function('dladdr', dependencies : dl_dep))
cdata.set('GST_ENABLE_EXTRA_CHECKS', get_option('extra-checks')) cdata.set('GST_ENABLE_EXTRA_CHECKS', not get_option('extra-checks').disabled())
cdata.set('USE_POISONING', get_option('poisoning')) cdata.set('USE_POISONING', get_option('poisoning'))
configinc = include_directories('.') configinc = include_directories('.')

View file

@ -9,7 +9,6 @@ option('ptp-helper-setuid-group', type : 'string',
description : 'Group to switch to when installing gst-ptp-helper setuid root') description : 'Group to switch to when installing gst-ptp-helper setuid root')
option('ptp-helper-permissions', type : 'combo', option('ptp-helper-permissions', type : 'combo',
choices : ['none', 'setuid-root', 'capabilities', 'auto'], value : 'auto') choices : ['none', 'setuid-root', 'capabilities', 'auto'], value : 'auto')
option('extra-checks', type : 'boolean', value : true, description : 'Enable extra runtime checks')
option('option-parsing', type : 'boolean', value : true, option('option-parsing', type : 'boolean', value : true,
description: 'Enable command line option parsing') description: 'Enable command line option parsing')
option('poisoning', type : 'boolean', value : false, description : 'Enable poisoning of deallocated objects') option('poisoning', type : 'boolean', value : false, description : 'Enable poisoning of deallocated objects')
@ -39,6 +38,7 @@ option('glib-asserts', type : 'feature', value : 'enabled', yield : true,
description: 'Enable GLib assertion (auto = enabled for development, disabled for stable releases)') description: 'Enable GLib assertion (auto = enabled for development, disabled for stable releases)')
option('glib-checks', type : 'feature', value : 'enabled', yield : true, option('glib-checks', type : 'feature', value : 'enabled', yield : true,
description: 'Enable GLib checks such as API guards (auto = enabled for development, disabled for stable releases)') description: 'Enable GLib checks such as API guards (auto = enabled for development, disabled for stable releases)')
option('extra-checks', type : 'feature', value : 'enabled', yield : true, description : 'Enable extra runtime checks')
# Common options # Common options
option('package-name', type : 'string', yield : true, option('package-name', type : 'string', yield : true,