mirror of
https://gitlab.freedesktop.org/pipewire/pipewire
synced 2024-10-06 16:09:43 +00:00
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:
parent
e167123667
commit
6cea8b201b
|
@ -208,7 +208,6 @@ option('libusb',
|
||||||
type: 'feature',
|
type: 'feature',
|
||||||
value: 'auto')
|
value: 'auto')
|
||||||
option('session-managers',
|
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',
|
type : 'array',
|
||||||
choices : ['media-session', 'wireplumber'],
|
|
||||||
value : ['media-session'])
|
value : ['media-session'])
|
||||||
|
|
|
@ -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_path', wp_uninstalled.full_path())
|
||||||
conf_config_uninstalled.set('session_manager_args', 'wireplumber')
|
conf_config_uninstalled.set('session_manager_args', 'wireplumber')
|
||||||
conf_config_uninstalled.set('sm_comment', '')
|
conf_config_uninstalled.set('sm_comment', '')
|
||||||
|
else
|
||||||
|
conf_config_uninstalled.set('session_manager_path', default_sm)
|
||||||
|
conf_config_uninstalled.set('sm_comment', '')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
conf_files = [
|
conf_files = [
|
||||||
|
|
Loading…
Reference in a new issue