From 659b2824458931dd311eaf7aa2258def1c397a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 14 Dec 2022 09:34:05 +0100 Subject: [PATCH] =?UTF-8?q?meson:=20make=20=E2=80=98disk-io=E2=80=99=20plu?= =?UTF-8?q?gin=20compile=20time=20optional?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meson.build | 2 ++ meson_options.txt | 2 ++ modules/meson.build | 6 +++++- plugin.c | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 223d3c7..ebcec99 100644 --- a/meson.build +++ b/meson.build @@ -137,6 +137,7 @@ yambar = executable( plugin_battery_enabled ? '-DPLUGIN_ENABLED_BATTERY' : [], plugin_clock_enabled ? '-DPLUGIN_ENABLED_CLOCK' : [], plugin_cpu_enabled ? '-DPLUGIN_ENABLED_CPU' : [], + plugin_disk_io_enabled ? '-DPLUGIN_ENABLED_DISK_IO' : [], plugin_dwl_enabled ? '-DPLUGIN_ENABLED_DWL' : [], plugin_mpd_enabled ? '-DPLUGIN_ENABLED_MPD' : [], plugin_pipewire_enabled ? '-DPLUGIN_ENABLED_PIPEWIRE' : [], @@ -184,6 +185,7 @@ summary( 'Battery': plugin_battery_enabled, 'Clock': plugin_clock_enabled, 'CPU': plugin_cpu_enabled, + 'Disk I/O': plugin_disk_io_enabled, 'DWL (dwm for Wayland)': plugin_dwl_enabled, 'Music Player Daemon (MPD)': plugin_mpd_enabled, 'Pipewire': plugin_pipewire_enabled, diff --git a/meson_options.txt b/meson_options.txt index ca92b74..ad1f130 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,6 +16,8 @@ option('plugin-clock', type: 'feature', value: 'auto', description: 'Clock support') option('plugin-cpu', type: 'feature', value: 'auto', description: 'CPU support') +option('plugin-disk-io', type: 'feature', value: 'auto', + description: 'Disk I/O support') option('plugin-dwl', type: 'feature', value: 'auto', description: 'DWL (dwm for wayland) support') option('plugin-mpd', type: 'feature', value: 'auto', diff --git a/modules/meson.build b/modules/meson.build index a061e01..aedc343 100644 --- a/modules/meson.build +++ b/modules/meson.build @@ -18,6 +18,7 @@ plugin_battery_enabled = udev_battery.found() plugin_clock_enabled = get_option('plugin-clock').allowed() plugin_cpu_enabled = get_option('plugin-cpu').allowed() +plugin_disk_io_enabled = get_option('plugin-disk-io').allowed() mpd = dependency('libmpdclient', required: get_option('plugin-mpd')) plugin_mpd_enabled = mpd.found() @@ -32,7 +33,6 @@ plugin_dwl_enabled = get_option('plugin-dwl').allowed() # Module name -> (source-list, dep-list) mod_data = { - 'disk-io': [[], [dynlist]], 'mem': [[], []], 'i3': [['i3-common.c', 'i3-common.h'], [dynlist, json]], 'label': [[], []], @@ -62,6 +62,10 @@ if plugin_cpu_enabled mod_data += {'cpu': [[], []]} endif +if plugin_disk_io_enabled + mod_data += {'disk-io': [[], [dynlist]]} +endif + if plugin_dwl_enabled mod_data += {'dwl': [[], [dynlist]]} endif diff --git a/plugin.c b/plugin.c index c54a97f..0828e7e 100644 --- a/plugin.c +++ b/plugin.c @@ -47,7 +47,9 @@ EXTERN_MODULE(clock); #if defined(PLUGIN_ENABLED_CPU) EXTERN_MODULE(cpu); #endif +#if defined(PLUGIN_ENABLED_DISK_IO) EXTERN_MODULE(disk_io); +#endif #if defined(PLUGIN_ENABLED_DWL) EXTERN_MODULE(dwl); #endif @@ -149,7 +151,9 @@ init(void) #if defined(PLUGIN_ENABLED_CPU) REGISTER_CORE_MODULE(cpu, cpu); #endif +#if defined(PLUGIN_ENABLED_DISK_IO) REGISTER_CORE_MODULE(disk-io, disk_io); +#endif #if defined(PLUGIN_ENABLED_DWL) REGISTER_CORE_MODULE(dwl, dwl); #endif