openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

fix: Use OPENSSL_EXE_DIR instead of OPENSSL_ROOT_DIR on Windows

Browse Source
This commit is contained in:
Nick Bolton
2024-10-16 21:53:25 +01:00
committed by Chris Rizzitello
parent 52f616a15d
commit 1dc449fe0a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Libraries.cmake
View File

@ -525,9 +525,9 @@ macro(configure_openssl)
if(WIN32) #Used for dev in TLS and WIX
cmake_path(SET OPENSSL_ROOT_DIR NORMALIZE
"${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows")
message(STATUS "SET OPENSSL ROOT: ${OPENSSL_ROOT_DIR}")
message(VERBOSE "Set OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
set(OPENSSL_EXE_DIR "${OPENSSL_ROOT_DIR}/tools/openssl")
add_definitions(-DOPENSSL_EXE_DIR="${OPENSSL_ROOT_DIR}")
add_definitions(-DOPENSSL_EXE_DIR="${OPENSSL_EXE_DIR}")
endif()
endmacro()

9
src/lib/gui/tls/TlsCertificate.cpp
View File

@ -52,11 +52,14 @@ QString openSslWindowsDir() {
}
// if the path still isn't found, something is seriously wrong.
if (!openSslDir.exists()) {
qFatal() << "openssl dir not found: " << openSslDir;
const auto path = openSslDir.absolutePath();
if (openSslDir.exists()) {
qDebug("openssl dir: %s", qUtf8Printable(path));
} else {
qFatal("openssl dir not found: %s", qUtf8Printable(path));
}
return QDir::cleanPath(openSslDir.absolutePath());
return QDir::cleanPath(path);
}
QString openSslWindowsBinary() {