pxcloud/spice-common
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-01-08 12:36:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Meson: Make use of 'feature' option type introduced in version 0.47

Browse Source 
This built-in type is used instead of the tri-state string combo
(auto/true/false), simplifying the dependency checks.

http://mesonbuild.com/Build-options.html#features

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Eduardo Lima (Etrunko) 2018-07-26 14:26:47 -03:00 committed by Frediano Ziglio
parent 12af62316d
commit d6c05fb046
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -115,13 +115,10 @@ endforeach
optional_deps = {'celt051' : '>= 0.5.1.1',
'opus' : '>= 0.9.14'}
foreach dep, version : optional_deps
option_value = get_option(dep)
if option_value != 'false'
d = dependency(dep, required: (option_value == 'true'), version : version)
if d.found()
spice_common_deps += d
spice_common_config_data.set('HAVE_@0@'.format(dep.underscorify().to_upper()), '1')
endif
d = dependency(dep, required : get_option(dep), version : version)
if d.found()
spice_common_deps += d
spice_common_config_data.set('HAVE_@0@'.format(dep.underscorify().to_upper()), '1')
endif
endforeach

7
meson_options.txt
View File

@ -11,15 +11,12 @@ option('extra-checks',
description : 'Enable extra checks on code')
option('celt051',
type : 'combo',
choices : ['true', 'false', 'auto'],
value : 'auto',
type : 'feature',
yield : true,
description: 'Enable celt051 audio codec')
option('opus',
type : 'combo',
choices : ['true', 'false', 'auto'],
type : 'feature',
yield : true,
description: 'Enable Opus audio codec')