OpenSSL FIx

Author: Paulchen-Panther

cmake/linux/BundleLinux.cmake.in

@@ -1,6 +1,7 @@
 set(PROJECT_NAME "@PROJECT_NAME@")
 set(QMAKE_EXECUTABLE "@QMAKE_EXECUTABLE@")
 set(OPENSSL_FOUND @OPENSSL_FOUND@)
+set(OPENSSL_LIBRARIES "@OPENSSL_LIBRARIES@")
 set(PYTHON_MODULES_DIR "@PYTHON_MODULES_DIR@")
 set(PYTHON_VERSION "@PYTHON_VERSION@")
 set(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
@@ -54,6 +55,15 @@ foreach(PLUGIN "platforms" "sqldrivers" "imageformats" "tls" "wayland-shell-inte
 	endif()
 endforeach()
 
+# Append the OpenSSL library to the list
+if(OPENSSL_FOUND AND NOT OPENSSL_LIBRARIES STREQUAL "")
+	foreach(openssl_lib ${OPENSSL_LIBRARIES})
+		collect_dependencies(${openssl_lib} PREREQUISITE_LIBS)
+		gp_append_unique(PREREQUISITE_LIBS ${openssl_lib})
+		get_filename_component(file_canonical ${openssl_lib} REALPATH)
+		gp_append_unique(PREREQUISITE_LIBS ${file_canonical})
+	endforeach()
+endif()
 
 # Copy dependencies to 'share/hyperion/lib'
 file(INSTALL FILES ${PREREQUISITE_LIBS} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/hyperion/lib")

cmake/windows/BundleWindows.cmake.in

@@ -1,6 +1,7 @@
 set(ENABLE_MF @ENABLE_MF@)
 set(ENABLE_DX @ENABLE_DX@)
 set(OPENSSL_FOUND @OPENSSL_FOUND@)
+set(OPENSSL_INCLUDE_DIR "@OPENSSL_INCLUDE_DIR@")
 set(TurboJPEG_INCLUDE_DIR "@TurboJPEG_INCLUDE_DIR@")
 set(PYTHON_VERSION "@PYTHON_VERSION@")
 set(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
@@ -60,6 +61,47 @@ if(EXISTS @CMAKE_BINARY_DIR@/bin/@PROJECT_NAME@@CMAKE_EXECUTABLE_SUFFIX@)
 		list(REMOVE_AT DEPENDENCIES 0 1)
 	endwhile()
 
+	# Copy libssl/libcrypto to 'hyperion'
+	if(OPENSSL_FOUND AND NOT OPENSSL_INCLUDE_DIR STREQUAL "")
+		string(REGEX MATCHALL "[0-9]+" openssl_versions "@OPENSSL_VERSION@")
+		list(GET openssl_versions 0 openssl_version_major)
+		list(GET openssl_versions 1 openssl_version_minor)
+
+		set(open_ssl_version_suffix)
+		if(openssl_version_major VERSION_EQUAL 1 AND openssl_version_minor VERSION_EQUAL 1)
+			set(open_ssl_version_suffix "-1_1")
+		else()
+			set(open_ssl_version_suffix "-3")
+		endif()
+
+		if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64|ARM64|arm64")
+			string(APPEND open_ssl_version_suffix "-arm64")
+		elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+			string(APPEND open_ssl_version_suffix "-x64")
+		endif()
+
+		get_filename_component(OPENSSL_DIR "${OPENSSL_INCLUDE_DIR}" DIRECTORY)
+		foreach(comp "ssl" "crypto")
+			find_file(${comp}
+				NAMES
+					"lib${comp}${open_ssl_version_suffix}.dll"
+				PATHS
+					${OPENSSL_DIR}
+				PATH_SUFFIXES
+					bin
+			)
+
+			if(${${comp}})
+				install(
+					FILES
+						${${comp}}
+					DESTINATION
+						"${CMAKE_INSTALL_PREFIX}/bin"
+				)
+			endif()
+		endforeach()
+	endif()
+
 	# Create a qt.conf file in 'bin' to override hard-coded search paths in Qt plugins
 	file(WRITE "${CMAKE_INSTALL_PREFIX}/bin/qt.conf" "[Paths]\nPlugins=../lib/\n")
 
@@ -68,7 +110,12 @@ if(EXISTS @CMAKE_BINARY_DIR@/bin/@PROJECT_NAME@@CMAKE_EXECUTABLE_SUFFIX@)
 		get_filename_component(TURBOJPEG_DIR "${TurboJPEG_INCLUDE_DIR}" DIRECTORY)
 		find_file(TURBOJPEG_SHARED NAMES "turbojpeg.dll" PATHS ${TURBOJPEG_DIR} PATH_SUFFIXES bin)
 		if(TURBOJPEG_SHARED)
-			file(INSTALL FILES ${TURBOJPEG_SHARED} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+			file(INSTALL
+				FILES
+					${TURBOJPEG_SHARED}
+				DESTINATION
+					"${CMAKE_INSTALL_PREFIX}/bin"
+			)
 		endif()
 	endif()