Skip to content

Commit

Permalink
BUG: OpenSSL is needed for WADO to work with HTTPS.
Browse files Browse the repository at this point in the history
In Windows we have to include dlls. For now we assume the dlls are in the sdk-install folder.

In Linux they will most likely be already installed.

In Mac we will need more research.
  • Loading branch information
Woundorf committed Jul 8, 2022
1 parent 947acdf commit e99655b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
14 changes: 14 additions & 0 deletions starviewer/CMake/InstallTargets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,17 @@ elseif(UNIX AND NOT APPLE)
install(PROGRAMS "${SDK_INSTALL_DIR}/${LIBDIR}/${FILENAME}.5" TYPE LIB)
install(PROGRAMS "${SDK_INSTALL_DIR}/${LIBDIR}/${FILENAME}.5.64.0" TYPE LIB)
endif()

# OpenSSL
# TODO With a newer version of CMake (3.18) it could be directly downloaded and extracted from here.
# However for now we assume the dlls are in the sdk-install folder.
if(WIN32)
set(OPENSSL_LIBS
libcrypto-1_1-x64
libssl-1_1-x64
)
foreach(LIB ${OPENSSL_LIBS})
set(FILENAME ${LIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
install(PROGRAMS "${SDK_INSTALL_DIR}/bin/${FILENAME}" DESTINATION .)
endforeach()
endif()
1 change: 1 addition & 0 deletions starviewer/CMake/Installers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/installerresources/wixshortcuts.xm

# DEB
# TODO specify versions. Example: set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.1-6), libc6 (< 2.4)")
# TODO add openssl dependency for WADO
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libatk1.0-0, libatk-bridge2.0-0, libatspi2.0-0, libblkid1, libbsd0, libc6, libcairo2, libcairo-gobject2, libdatrie1,
libdbus-1-3, libdrm2, libegl1, libepoxy0, libexpat1, libffi7, libfontconfig1, libfreetype6, libfribidi0, libgcc-s1, libgcrypt20, libgdk-pixbuf2.0-0,
libgl1, libglib2.0-0, libglu1-mesa, libglvnd0, libglx0, libgpg-error0, libgraphite2-3, libgtk-3-0, libharfbuzz0b, libice6, liblz4-1, liblzma5, libmount1,
Expand Down

0 comments on commit e99655b

Please sign in to comment.