From e67d55ff048100bd22472a852b8f4f194fbd9e20 Mon Sep 17 00:00:00 2001 From: "S.M.Mousavi" Date: Thu, 4 Apr 2024 16:01:33 +0430 Subject: [PATCH 1/2] fixes #59 --- android_openssl.cmake | 2 +- openssl.pri | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android_openssl.cmake b/android_openssl.cmake index fb2254a..ccc611d 100644 --- a/android_openssl.cmake +++ b/android_openssl.cmake @@ -5,7 +5,7 @@ function(add_android_openssl_libraries) set(ssl_root_path ${CMAKE_CURRENT_FUNCTION_LIST_DIR}) endif() - if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0) + if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0 OR (QT_VERSION VERSION_GREATER_EQUAL 5.15.8 AND QT_VERSION VERSION_LESS 6.0.0)) if(NOT OPENSSL_ROOT_DIR) set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_3/${CMAKE_ANDROID_ARCH_ABI}) endif() diff --git a/openssl.pri b/openssl.pri index a9974fa..15e9a9d 100644 --- a/openssl.pri +++ b/openssl.pri @@ -2,7 +2,8 @@ CONFIG(release, debug|release): SSL_PATH = $$PWD else: SSL_PATH = $$PWD/no-asm - if (versionAtLeast(QT_VERSION, 6.5.0)) { + if (versionAtLeast(QT_VERSION, 6.5.0) | if(versionAtLeast(QT_VERSION, 5.15.8) : versionAtMost(QT_VERSION, 6.0.0))) { + message(Using OpenSSL v3) ANDROID_EXTRA_LIBS += \ $$SSL_PATH/ssl_3/arm64-v8a/libcrypto_3.so \ $$SSL_PATH/ssl_3/arm64-v8a/libssl_3.so \ @@ -13,6 +14,7 @@ $$SSL_PATH/ssl_3/x86_64/libcrypto_3.so \ $$SSL_PATH/ssl_3/x86_64/libssl_3.so } else { + warning("Using OpenSSL v1.1, it was deprecated") ANDROID_EXTRA_LIBS += \ $$SSL_PATH/ssl_1.1/arm64-v8a/libcrypto_1_1.so \ $$SSL_PATH/ssl_1.1/arm64-v8a/libssl_1_1.so \ From 71397bf5991dccc801012018bab8f163407cb751 Mon Sep 17 00:00:00 2001 From: "S.M.Mousavi" Date: Fri, 16 Aug 2024 20:24:07 +0330 Subject: [PATCH 2/2] Messages added to the cmake import file just like qmake one --- android_openssl.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android_openssl.cmake b/android_openssl.cmake index ccc611d..6f63894 100644 --- a/android_openssl.cmake +++ b/android_openssl.cmake @@ -6,6 +6,7 @@ function(add_android_openssl_libraries) endif() if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0 OR (QT_VERSION VERSION_GREATER_EQUAL 5.15.8 AND QT_VERSION VERSION_LESS 6.0.0)) + message("Using OpenSSL v3") if(NOT OPENSSL_ROOT_DIR) set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_3/${CMAKE_ANDROID_ARCH_ABI}) endif() @@ -13,6 +14,7 @@ function(add_android_openssl_libraries) ${ssl_root_path}/ssl_3/${CMAKE_ANDROID_ARCH_ABI}/libcrypto_3.so ${ssl_root_path}/ssl_3/${CMAKE_ANDROID_ARCH_ABI}/libssl_3.so) else() + message(WARNING "Using OpenSSL v1.1, it was deprecated") if(NOT OPENSSL_ROOT_DIR) set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}) endif()