diff --git a/.gitignore b/.gitignore index 157a5bdb..a6c78627 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /client/resources/translations/*.qm +deploy diff --git a/package/CMakeLists.txt b/package/CMakeLists.txt index ce067937..1de231bb 100644 --- a/package/CMakeLists.txt +++ b/package/CMakeLists.txt @@ -65,7 +65,8 @@ if (WIN32) ) # add SSL librariesOpenSSL\Win_x64\bin - file(GLOB OPENSSL_LIBRARIES "${qt5_install_prefix}/../../Tools/OpenSSL/Win_x64/bin/*.dll") + # file(GLOB OPENSSL_LIBRARIES "${qt5_install_prefix}/../../Tools/OpenSSL/Win_x64/bin/*.dll") + file(GLOB OPENSSL_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/openssl/64bits/*.dll") message(STATUS "******************* ${OPENSSL_LIBRARIES} ${qt5_install_prefix} ${CPACK_PACKAGING_INSTALL_PREFIX}") install(FILES ${OPENSSL_LIBRARIES} DESTINATION bin COMPONENT openssl) @@ -105,7 +106,7 @@ if (WIN32) # Run VC++ redistributable - list(APPEND CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait 'cmd /c $INSTDIR\\\\VC_redist.x64.exe /install /passive /norestart'") + list(APPEND CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait 'cmd /c $INSTDIR\\\\bin\\\\VC_redist.x64.exe /install /passive /norestart'") # Set files to install - everything in deploy folder #install( diff --git a/package/openssl/64bits/libcrypto-1_1-x64.dll b/package/openssl/64bits/libcrypto-1_1-x64.dll new file mode 100644 index 00000000..d91fe73b Binary files /dev/null and b/package/openssl/64bits/libcrypto-1_1-x64.dll differ diff --git a/package/openssl/64bits/libssl-1_1-x64.dll b/package/openssl/64bits/libssl-1_1-x64.dll new file mode 100644 index 00000000..43baf830 Binary files /dev/null and b/package/openssl/64bits/libssl-1_1-x64.dll differ