mirror of
https://github.com/izzy2lost/android_openssl.git
synced 2026-06-19 01:20:12 -07:00
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:
+8
-6
@@ -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}")
|
||||
|
||||
Reference in New Issue
Block a user