From 7ce1e553b839bc412c727fafb5d9baaa2a0e606b Mon Sep 17 00:00:00 2001 From: Carter Li Date: Thu, 28 May 2026 15:55:43 +0800 Subject: [PATCH] CMake: makes default structure configurable via CMake --- CMakeLists.txt | 2 +- src/data/structure.txt | 1 - src/fastfetch_datatext.h.in | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 src/data/structure.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 918f43556..0a1f2e47b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,6 +109,7 @@ option(ENABLE_LUA "Enable lua scripting for format strings" ON) option(ENABLE_QUICKJS "Enable quickjs scripting for format strings" ON) option(ENABLE_LIBZFS "Enable libzfs" ON) option(ENABLE_WCWIDTH "Detect wide-width characters with wcwidth when calculating logo and separator width. Disable for a smaller and slightly faster build, but logos containing CJK/emoji may be measured too narrow and render incorrectly. Such usecases are uncommon." ON) +set(DEFAULT_STRUCTURE "Title:Separator:OS:Host:Kernel:Uptime:Packages:Shell:Display:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:LocalIp:Battery:PowerAdapter:Locale:Break:Colors" CACHE STRING "Default module structure for detection") if(WIN32 AND NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") option(ENABLE_WIN81_COMPAT "Enable legacy Windows compatibility (Windows 8.1 and later; Windows 7 unsupported)" ON) endif() @@ -365,7 +366,6 @@ else() endif() fastfetch_encode_c_string("${DATATEXT_JSON_HELP}" DATATEXT_JSON_HELP) -fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE) configure_file(src/fastfetch_config.h.in fastfetch_config.h @ONLY) configure_file(src/fastfetch_datatext.h.in fastfetch_datatext.h @ONLY) diff --git a/src/data/structure.txt b/src/data/structure.txt deleted file mode 100644 index 717e3a3a3..000000000 --- a/src/data/structure.txt +++ /dev/null @@ -1 +0,0 @@ -Title:Separator:OS:Host:Kernel:Uptime:Packages:Shell:Display:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:LocalIp:Battery:PowerAdapter:Locale:Break:Colors diff --git a/src/fastfetch_datatext.h.in b/src/fastfetch_datatext.h.in index 5c73b9d49..127db626e 100644 --- a/src/fastfetch_datatext.h.in +++ b/src/fastfetch_datatext.h.in @@ -1,4 +1,4 @@ #pragma once #define FASTFETCH_DATATEXT_JSON_HELP @DATATEXT_JSON_HELP@ -#define FASTFETCH_DATATEXT_STRUCTURE @DATATEXT_STRUCTURE@ +#define FASTFETCH_DATATEXT_STRUCTURE "@DEFAULT_STRUCTURE@"