Skip to content

Commit

Permalink
Fixed issues with installer with OpenSSL libs. Now packaging own vers…
Browse files Browse the repository at this point in the history
…ion instead of using provided DLLs from Qt.
  • Loading branch information
SBriere committed Feb 1, 2021
1 parent 1c08893 commit 0c235c0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/client/resources/translations/*.qm
deploy
5 changes: 3 additions & 2 deletions package/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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(
Expand Down
Binary file added package/openssl/64bits/libcrypto-1_1-x64.dll
Binary file not shown.
Binary file added package/openssl/64bits/libssl-1_1-x64.dll
Binary file not shown.

0 comments on commit 0c235c0

Please sign in to comment.