From f50d3f42f6d7d25d4cb59e89dd760bd8fa4e164d Mon Sep 17 00:00:00 2001
From: Blessio <24902257+blessio@users.noreply.github.com>
Date: Sat, 29 Nov 2025 16:53:45 +0100
Subject: [PATCH] Fixed WindowsBuild with command-line (not in VisualStudio but
 in VSCode) to be able to compile and run tests

---
 CMakeLists.txt | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95d6e0b96..b558aa2af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -422,6 +422,23 @@ if (MSVC)
 endif()
 
 if(WIN32)
+    # Additional search paths for Windows if not building/running in Visual Studio environment (e.g. commandline or VSCode)
+    
+    # 1.Resolve the ambiguity of using two names for one architecture
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "x64")
+        set(ARCH_DIR "x64")
+    else()
+       set(ARCH_DIR "${CMAKE_SYSTEM_PROCESSOR}")
+    endif()
+    # 2. Locate Windows SDK Paths
+    if (CMAKE_WINDOWS_KITS_10_DIR)
+       set(WINSDKROOTC_INCLUDE "${CMAKE_WINDOWS_KITS_10_DIR}/Include/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um")
+        set(WINSDKROOTC_LIB     "${CMAKE_WINDOWS_KITS_10_DIR}/LIB/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um/${ARCH_DIR}")
+    else()
+        set(WINSDKROOTC_INCLUDE "$ENV{ProgramFiles\(x86\)}/Windows Kits/10/Include/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um")
+        set(WINSDKROOTC_LIB     "$ENV{ProgramFiles\(x86\)}/Windows Kits/10/LIB/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/um/${ARCH_DIR}")
+    endif()
+
     set(CMAKE_RC_COMPILER_INIT windres)
     enable_language(RC)
     if(MINGW)
@@ -443,7 +460,11 @@ if(WIN32)
         endif()
     endif()
     # Determine if we can link against the Windows SDK, used for Windows Hello support
-    find_library(WINSDK WindowsApp.lib)
+    find_library(WINSDK WindowsApp.lib
+       HINTS   
+         ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}
+         ${WINSDKROOTC_LIB}
+    )
 endif()
 
 if(APPLE AND WITH_APP_BUNDLE OR WIN32)