From b1c42de03589da6fe6cf42cbb72db9cc1e48fe29 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 18 Apr 2023 15:47:29 +0300 Subject: [PATCH] Fixed a few CMake issues - use CMAKE_ANDROID_ARCH_ABI instead of ANDROID_TARGET_ARCH - set QT_ANDROID_EXTRA_LIBS target property Fixed: #41, #42 --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea0bb23..6348d16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,15 +4,17 @@ else() set (SSL_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}) endif() - -if (QT_VERSION LESS 6.5.0) +if (Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0) set(ANDROID_EXTRA_LIBS - ${SSL_ROOT_PATH}/ssl_1.1/${ANDROID_TARGET_ARCH}/libcrypto_1_1.so - ${SSL_ROOT_PATH}/ssl_1.1/${ANDROID_TARGET_ARCH}/libssl_1_1.so + ${SSL_ROOT_PATH}/ssl_3/${CMAKE_ANDROID_ARCH_ABI}/libcrypto_3.so + ${SSL_ROOT_PATH}/ssl_3/${CMAKE_ANDROID_ARCH_ABI}/libssl_3.so CACHE INTERNAL "") else() set(ANDROID_EXTRA_LIBS - ${SSL_ROOT_PATH}/ssl_3/${ANDROID_TARGET_ARCH}/libcrypto_3.so - ${SSL_ROOT_PATH}/ssl_3/${ANDROID_TARGET_ARCH}/libssl_3.so + ${SSL_ROOT_PATH}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}/libcrypto_1_1.so + ${SSL_ROOT_PATH}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}/libssl_1_1.so CACHE INTERNAL "") endif() + +set_target_properties(${PROJECT_NAME} PROPERTIES + QT_ANDROID_EXTRA_LIBS "${ANDROID_EXTRA_LIBS}")