From b23365ccacd25911a35a31d8b6b869512520f1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Wed, 14 Dec 2022 09:31:48 +0100
Subject: [PATCH] =?UTF-8?q?meson:=20make=20=E2=80=98cpu=E2=80=99=20plugin?=
 =?UTF-8?q?=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            | 8 ++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 7b4bf40..223d3c7 100644
--- a/meson.build
+++ b/meson.build
@@ -136,6 +136,7 @@ yambar = executable(
     plugin_backlight_enabled ? '-DPLUGIN_ENABLED_BACKLIGHT' : [],
     plugin_battery_enabled ? '-DPLUGIN_ENABLED_BATTERY' : [],
     plugin_clock_enabled ? '-DPLUGIN_ENABLED_CLOCK' : [],
+    plugin_cpu_enabled ? '-DPLUGIN_ENABLED_CPU' : [],
     plugin_dwl_enabled ? '-DPLUGIN_ENABLED_DWL' : [],
     plugin_mpd_enabled ? '-DPLUGIN_ENABLED_MPD' : [],
     plugin_pipewire_enabled ? '-DPLUGIN_ENABLED_PIPEWIRE' : [],
@@ -182,6 +183,7 @@ summary(
     'Backlight': plugin_backlight_enabled,
     'Battery': plugin_battery_enabled,
     'Clock': plugin_clock_enabled,
+    'CPU': plugin_cpu_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 cce0d08..ca92b74 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,6 +14,8 @@ option('plugin-battery', type: 'feature', value: 'auto',
        description: 'Battery support')
 option('plugin-clock', type: 'feature', value: 'auto',
        description: 'Clock support')
+option('plugin-cpu', type: 'feature', value: 'auto',
+       description: 'CPU 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 4a06e43..a061e01 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -17,6 +17,7 @@ udev_battery = dependency('libudev', required: get_option('plugin-battery'))
 plugin_battery_enabled = udev_battery.found()
 
 plugin_clock_enabled = get_option('plugin-clock').allowed()
+plugin_cpu_enabled = get_option('plugin-cpu').allowed()
 
 mpd = dependency('libmpdclient', required: get_option('plugin-mpd'))
 plugin_mpd_enabled = mpd.found()
@@ -31,7 +32,6 @@ plugin_dwl_enabled = get_option('plugin-dwl').allowed()
 
 # Module name -> (source-list, dep-list)
 mod_data = {
-  'cpu': [[], []],
   'disk-io': [[], [dynlist]],
   'mem': [[], []],
   'i3': [['i3-common.c', 'i3-common.h'], [dynlist, json]],
@@ -58,6 +58,10 @@ if plugin_clock_enabled
   mod_data += {'clock': [[], []]}
 endif
 
+if plugin_cpu_enabled
+  mod_data += {'cpu': [[], []]}
+endif
+
 if plugin_dwl_enabled
   mod_data += {'dwl': [[], [dynlist]]}
 endif
diff --git a/plugin.c b/plugin.c
index 10acb3f..c54a97f 100644
--- a/plugin.c
+++ b/plugin.c
@@ -44,6 +44,9 @@ EXTERN_MODULE(battery);
 #if defined(PLUGIN_ENABLED_CLOCK)
 EXTERN_MODULE(clock);
 #endif
+#if defined(PLUGIN_ENABLED_CPU)
+EXTERN_MODULE(cpu);
+#endif
 EXTERN_MODULE(disk_io);
 #if defined(PLUGIN_ENABLED_DWL)
 EXTERN_MODULE(dwl);
@@ -67,7 +70,6 @@ EXTERN_MODULE(sway_xkb);
 EXTERN_MODULE(script);
 EXTERN_MODULE(xkb);
 EXTERN_MODULE(xwindow);
-EXTERN_MODULE(cpu);
 EXTERN_MODULE(mem);
 
 EXTERN_PARTICLE(empty);
@@ -143,6 +145,9 @@ init(void)
 #endif
 #if defined(PLUGIN_ENABLED_CLOCK)
     REGISTER_CORE_MODULE(clock, clock);
+#endif
+#if defined(PLUGIN_ENABLED_CPU)
+    REGISTER_CORE_MODULE(cpu, cpu);
 #endif
     REGISTER_CORE_MODULE(disk-io, disk_io);
 #if defined(PLUGIN_ENABLED_DWL)
@@ -176,7 +181,6 @@ init(void)
     REGISTER_CORE_MODULE(xwindow, xwindow);
 #endif
     REGISTER_CORE_MODULE(mem, mem);
-    REGISTER_CORE_MODULE(cpu, cpu);
 
     REGISTER_CORE_PARTICLE(empty, empty);
     REGISTER_CORE_PARTICLE(list, list);