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

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
Show stats 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 if(WIN32) #Used for dev in TLS and WIX
cmake_path(SET OPENSSL_ROOT_DIR NORMALIZE cmake_path(SET OPENSSL_ROOT_DIR NORMALIZE
"${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows") "${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") 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() endif()
endmacro() 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 the path still isn't found, something is seriously wrong.
if (!openSslDir.exists()) { const auto path = openSslDir.absolutePath();
qFatal() << "openssl dir not found: " << openSslDir; 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() { QString openSslWindowsBinary() {