From 972d7d332f7013ff2482d8f845098e64091b0e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Han=C3=A7erli?= <burak.hancerli@qt.io>
Date: Mon, 18 Nov 2024 07:53:53 +0000
Subject: [PATCH] Try to locate openssl path if it's not set
---
CMakeLists.txt | 7 +++++++
src/CMakeLists.txt | 3 ---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf02083..9b3ed7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,13 @@ if(QT_VERSION VERSION_LESS QT_MINIMUM_VERSION)
endif()
if(ANDROID)
+ # try to locate the OpenSSL for Android if not set
+ if(NOT DEFINED ANDROID_OPENSSL_PATH OR ANDROID_OPENSSL_PATH STREQUAL "")
+ if(EXISTS "${ANDROID_SDK_ROOT}/android_openssl/ssl_3/${ANDROID_ABI}")
+ set(ANDROID_OPENSSL_PATH ${ANDROID_SDK_ROOT}/android_openssl/ssl_3/${ANDROID_ABI})
+ endif()
+ endif()
+
if(NOT EXISTS ${ANDROID_OPENSSL_PATH})
message(WARNING "Cannot find OpenSSL for Android. Path: ${ANDROID_OPENSSL_PATH}")
message(FATAL_ERROR "Please set ANDROID_OPENSSL_PATH to the path of OpenSSL for Android.")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1ad4cd..e85bc2f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,9 +69,6 @@ target_link_libraries(qtuiviewerlib PRIVATE
Qt6::Qml
Qt6::Gui
Qt6::GuiPrivate
- Qt6::Multimedia
- Qt6::MultimediaWidgets
- Qt6::Concurrent
Qt6::WebSockets
)
--
GitLab