From d372462378616b42306e59bbe42e730e06318b3d Mon Sep 17 00:00:00 2001
From: alfredo1491 <mtorrezalfredo@gmail.com>
Date: Sat, 23 May 2026 07:41:35 -0400
Subject: [PATCH] build(win32): make sure openssl dir is added to search path
 for depends always

---
 src/apps/CMakeLists.txt                 | 10 ++++++++++
 src/apps/deskflow-core/CMakeLists.txt   |  1 +
 src/apps/deskflow-daemon/CMakeLists.txt |  1 +
 src/apps/deskflow-gui/CMakeLists.txt    |  1 +
 4 files changed, 13 insertions(+)

diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
index 0fd26ee7d..2f7669de9 100644
--- a/src/apps/CMakeLists.txt
+++ b/src/apps/CMakeLists.txt
@@ -37,6 +37,16 @@ set(WIN32_PRE_EXCLUDE_REGEXES
 
 set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*")
 
+set(WIN32_RUNTIME_DEPENDENCY_SET_ARGS)
+if(WIN32)
+# Runtime DLL fallback for layouts like vcpkg
+  if(DEFINED OPENSSL_EXE_DIR AND EXISTS "${OPENSSL_EXE_DIR}")
+    list(APPEND WIN32_RUNTIME_DEPENDENCY_SET_ARGS DIRECTORIES "${OPENSSL_EXE_DIR}")
+  elseif(DEFINED OPENSSL_ROOT_DIR AND EXISTS "${OPENSSL_ROOT_DIR}/bin")
+    list(APPEND WIN32_RUNTIME_DEPENDENCY_SET_ARGS DIRECTORIES "${OPENSSL_ROOT_DIR}/bin")
+  endif()
+endif()
+
 add_subdirectory(deskflow-core)
 add_subdirectory(deskflow-daemon) #Only used on windows
 add_subdirectory(deskflow-gui)
diff --git a/src/apps/deskflow-core/CMakeLists.txt b/src/apps/deskflow-core/CMakeLists.txt
index 2b4d990be..d1715a3d9 100644
--- a/src/apps/deskflow-core/CMakeLists.txt
+++ b/src/apps/deskflow-core/CMakeLists.txt
@@ -56,6 +56,7 @@ if(BUILD_OSX_BUNDLE)
   endif()
 elseif (WIN32)
   install(RUNTIME_DEPENDENCY_SET coreDeps
+    ${WIN32_RUNTIME_DEPENDENCY_SET_ARGS}
     PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
     POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/src/apps/deskflow-daemon/CMakeLists.txt b/src/apps/deskflow-daemon/CMakeLists.txt
index 070c9248b..69cfea48e 100644
--- a/src/apps/deskflow-daemon/CMakeLists.txt
+++ b/src/apps/deskflow-daemon/CMakeLists.txt
@@ -38,6 +38,7 @@ if(WIN32)
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   )
   install(RUNTIME_DEPENDENCY_SET daemonDeps
+    ${WIN32_RUNTIME_DEPENDENCY_SET_ARGS}
     PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
     POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt
index c485f84a3..b349c2385 100644
--- a/src/apps/deskflow-gui/CMakeLists.txt
+++ b/src/apps/deskflow-gui/CMakeLists.txt
@@ -60,6 +60,7 @@ if(WIN32)
   set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
 
   install(RUNTIME_DEPENDENCY_SET guiDeps
+    ${WIN32_RUNTIME_DEPENDENCY_SET_ARGS}
     PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
     POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}