Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-03 10:00:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix install of libssl and libcrypto on Windows build

Browse Source 
* Replace find_library with find_file. CMake likely changed behavior of find_library to exclude dll files.
This commit is contained in:
Jonathan White 2020-04-09 14:18:04 -04:00
parent 0a2dd28cd8
commit 7ef1ee916b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CMakeLists.txt
View File

@ -487,8 +487,16 @@ if(MINGW)
install(FILES ${Qt5_PREFIX}/ssl/certs/ca-bundle.crt DESTINATION "ssl/certs") install(FILES ${Qt5_PREFIX}/ssl/certs/ca-bundle.crt DESTINATION "ssl/certs")
# install OpenSSL library # install OpenSSL library
if(WITH_XC_NETWORKING) if(WITH_XC_NETWORKING)
find_library(OPENSSL_DLL NAMES libssl-1_1.dll libssl-1_1-x64.dll PATH_SUFFIXES bin) find_file(OPENSSL_DLL NAMES libssl-1_1.dll libssl-1_1-x64.dll)
find_library(CRYPTO_DLL NAMES libcrypto-1_1.dll libcrypto-1_1-x64.dll PATH_SUFFIXES bin) if (NOT OPENSSL_DLL)
message(FATAL_ERROR "Cannot find libssl dll, ensure openssl is properly installed.")
endif()
find_file(CRYPTO_DLL NAMES libcrypto-1_1.dll libcrypto-1_1-x64.dll)
if (NOT OPENSSL_DLL)
message(FATAL_ERROR "Cannot find libcrypto dll, ensure libgcrypt is properly installed.")
endif()
install(FILES ${OPENSSL_DLL} ${CRYPTO_DLL} DESTINATION ".") install(FILES ${OPENSSL_DLL} ${CRYPTO_DLL} DESTINATION ".")
endif() endif()
endif() endif()