From 91e7664849768c9cedb26f660f10ddd5a9a7bf68 Mon Sep 17 00:00:00 2001
From: ayeteadoe <ayeteadoe@gmail.com>
Date: Mon, 23 Jun 2025 23:48:06 -0700
Subject: [PATCH] CMake: Allow Windows to build Lib/Test GUI targets

---
 CMakeLists.txt    | 4 ++--
 CMakePresets.json | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afcc5bf265..93283e7a81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ if (ANDROID AND ENABLE_QT)
     set(ENABLE_QT OFF CACHE BOOL "" FORCE)
 endif()
 
-if (ENABLE_QT AND ENABLE_GUI_TARGETS)
+if (ENABLE_QT AND ENABLE_GUI_TARGETS AND (NOT WIN32 OR NOT ENABLE_WINDOWS_CI))
     set(CMAKE_AUTOMOC ON)
     set(CMAKE_AUTORCC ON)
     set(CMAKE_AUTOUIC ON)
@@ -74,7 +74,7 @@ find_package(OpenSSL REQUIRED)
 
 include(CTest) # for BUILD_TESTING option, default ON
 
-if (ENABLE_GUI_TARGETS)
+if (ENABLE_GUI_TARGETS AND (NOT WIN32 OR NOT ENABLE_WINDOWS_CI))
     add_subdirectory(Services)
     add_subdirectory(UI)
 endif()
diff --git a/CMakePresets.json b/CMakePresets.json
index 00a420e130..497baa9a1b 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -51,9 +51,7 @@
       },
       "cacheVariables": {
         "CMAKE_C_COMPILER": "clang-cl",
-        "CMAKE_CXX_COMPILER": "clang-cl",
-        "ENABLE_QT": "OFF",
-        "ENABLE_GUI_TARGETS": "OFF"
+        "CMAKE_CXX_COMPILER": "clang-cl"
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -156,7 +154,8 @@
       ],
       "displayName": "Windows CI Config",
       "cacheVariables": {
-        "ENABLE_WINDOWS_CI": "ON"
+        "ENABLE_WINDOWS_CI": "ON",
+        "ENABLE_QT": "OFF"
       }
     },
     {