smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build(win32): make sure openssl dir is added to search path for depends always

Browse source
This commit is contained in:
alfredo1491 2026-05-23 07:41:35 -04:00 committed by Nick Bolton
parent 62a8ee749f
commit d372462378
4 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/apps/CMakeLists.txt
View file

@ -37,6 +37,16 @@ set(WIN32_PRE_EXCLUDE_REGEXES
set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*") 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-core)
add_subdirectory(deskflow-daemon) #Only used on windows add_subdirectory(deskflow-daemon) #Only used on windows
add_subdirectory(deskflow-gui) add_subdirectory(deskflow-gui)

1
src/apps/deskflow-core/CMakeLists.txt
View file

@ -56,6 +56,7 @@ if(BUILD_OSX_BUNDLE)
endif() endif()
elseif (WIN32) elseif (WIN32)
install(RUNTIME_DEPENDENCY_SET coreDeps install(RUNTIME_DEPENDENCY_SET coreDeps
${WIN32_RUNTIME_DEPENDENCY_SET_ARGS}
PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES} PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES} POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}

1
src/apps/deskflow-daemon/CMakeLists.txt
View file

@ -38,6 +38,7 @@ if(WIN32)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
) )
install(RUNTIME_DEPENDENCY_SET daemonDeps install(RUNTIME_DEPENDENCY_SET daemonDeps
${WIN32_RUNTIME_DEPENDENCY_SET_ARGS}
PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES} PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES} POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}

1
src/apps/deskflow-gui/CMakeLists.txt
View file

@ -60,6 +60,7 @@ if(WIN32)
set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT") set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
install(RUNTIME_DEPENDENCY_SET guiDeps install(RUNTIME_DEPENDENCY_SET guiDeps
${WIN32_RUNTIME_DEPENDENCY_SET_ARGS}
PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES} PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES} POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}