diff --git a/starviewer/CMake/InstallTargets.cmake b/starviewer/CMake/InstallTargets.cmake index 2e83779a3..32b3833a9 100644 --- a/starviewer/CMake/InstallTargets.cmake +++ b/starviewer/CMake/InstallTargets.cmake @@ -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() diff --git a/starviewer/CMake/Installers.cmake b/starviewer/CMake/Installers.cmake index ec8fa3b5b..0e5d4bafa 100644 --- a/starviewer/CMake/Installers.cmake +++ b/starviewer/CMake/Installers.cmake @@ -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,