LADI
/
spa
1
Fork 0
Code

meson: Allow session-managers option to be an absolute path 

If it's not an absolute_path, then set the build_ms and build_wp
as normal, otherwise use the value as passed in.
This commit is contained in:
Tom Briden 2021-10-23 10:51:16 +01:00 committed by Wim Taymans
parent e167123667
commit 6cea8b201b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meson_options.txt
View File

@ -208,7 +208,6 @@ option('libusb',
type: 'feature',
value: 'auto')
option('session-managers',
description : 'Session managers to build (can be [] for none)',
description : 'Session managers to build (can be [] for none or an absolute path)',
type : 'array',
choices : ['media-session', 'wireplumber'],
value : ['media-session'])

3
src/daemon/meson.build
View File

@ -58,6 +58,9 @@ elif default_sm == 'wireplumber'
conf_config_uninstalled.set('session_manager_path', wp_uninstalled.full_path())
conf_config_uninstalled.set('session_manager_args', 'wireplumber')
conf_config_uninstalled.set('sm_comment', '')
else
conf_config_uninstalled.set('session_manager_path', default_sm)
conf_config_uninstalled.set('sm_comment', '')
endif
conf_files = [