From 5d2d0b0566c9e2d4ec6f0838e2378063b06a8c9c Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 8 May 2024 16:32:46 +0200
Subject: cmake: load generic userconfig if it exists

---
 CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ffb8374..286a00a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,10 +83,13 @@ endmacro()
 
 macro(fm_load_userconfig)
     if(NOT DEFINED FLOORMAT_USERCONFIG)
-        if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-            set(ENV{USER} "$ENV{USERNAME}")
+        sets(FILEPATH FLOORMAT_USERCONFIG "${CMAKE_CURRENT_SOURCE_DIR}/userconfig.cmake")
+        if(NOT EXISTS "${FLOORMAT_USERCONFIG}")
+            if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+                set(ENV{USER} "$ENV{USERNAME}")
+            endif()
+            sets(FILEPATH FLOORMAT_USERCONFIG "${CMAKE_CURRENT_SOURCE_DIR}/userconfig-$ENV{USER}@${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}.cmake")
         endif()
-        sets(FILEPATH FLOORMAT_USERCONFIG "${CMAKE_CURRENT_SOURCE_DIR}/userconfig-$ENV{USER}@${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}.cmake")
     endif()
     if(NOT FLOORMAT_USERCONFIG STREQUAL "")
         if(EXISTS "${FLOORMAT_USERCONFIG}")
-- 
cgit v1.2.3