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
This commit is contained in:
BogDan Vatra
2023-04-18 15:57:22 +03:00
parent 8597b45107
commit b1c42de035
+8 -6
View File
@@ -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}")