From a5e3d3f7a78b3305da9632cd96a1af22f02a5293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Tonn=C3=A4tt?= Date: Sun, 1 Aug 2021 17:54:09 +0200 Subject: [PATCH] [Meson] Change jack-devel option to be boolean --- meson_options.txt | 4 ++-- pipewire-jack/meson.build | 2 +- pipewire-jack/src/meson.build | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index f34c6cc3b..35c83f963 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -52,8 +52,8 @@ option('pipewire-jack', value: 'enabled') option('jack-devel', description: 'Install jack development files', - type: 'feature', - value: 'disabled') + type: 'boolean', + value: 'false') option('libjack-path', description: 'Where to install the libjack.so library', type: 'string') diff --git a/pipewire-jack/meson.build b/pipewire-jack/meson.build index c295e45e2..fecc2820d 100644 --- a/pipewire-jack/meson.build +++ b/pipewire-jack/meson.build @@ -1,5 +1,5 @@ jack_inc = include_directories('.') -if get_option('jack-devel').enabled() +if get_option('jack-devel') == true install_subdir('jack', install_dir: get_option('includedir'), strip_directory: false) endif subdir('src') diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build index 4485dd23a..f6806afbd 100644 --- a/pipewire-jack/src/meson.build +++ b/pipewire-jack/src/meson.build @@ -68,7 +68,7 @@ pipewire_jackserver = shared_library('jacknet', install_dir : libjack_path, ) -if get_option('jack-devel').enabled() +if get_option('jack-devel') == true pkgconfig.generate(filebase : 'jack', libraries : [pipewire_jack, pipewire_jackserver], name : 'jack',