diff --git a/CMakeLists.txt b/CMakeLists.txt index 2571e44..49efc14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,23 @@ -if (CMAKE_BUILD_TYPE STREQUAL "Debug") - set (SSL_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}/no-asm) + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(SSL_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}/no-asm) else() - set (SSL_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}) + set(SSL_ROOT_PATH ${CMAKE_CURRENT_LIST_DIR}) endif() -if (Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0) - list(APPEND ANDROID_EXTRA_LIBS - ${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() - list(APPEND ANDROID_EXTRA_LIBS - ${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) -endif() +if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0) -set_target_properties(${PROJECT_NAME} PROPERTIES - QT_ANDROID_EXTRA_LIBS "${ANDROID_EXTRA_LIBS}") + if(NOT OPENSSL_ROOT_DIR) + set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_3/${CMAKE_ANDROID_ARCH_ABI}) + endif() + list(APPEND ANDROID_EXTRA_LIBS + ${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() + if(NOT OPENSSL_ROOT_DIR) + set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}) + endif() + list(APPEND ANDROID_EXTRA_LIBS + ${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) +endif() diff --git a/android_openssl.cmake b/android_openssl.cmake index 072f355..fb2254a 100644 --- a/android_openssl.cmake +++ b/android_openssl.cmake @@ -1,20 +1,26 @@ function(add_android_openssl_libraries) - if (CMAKE_BUILD_TYPE STREQUAL "Debug") - set (ssl_root_path ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/no-asm) - else() - set (ssl_root_path ${CMAKE_CURRENT_FUNCTION_LIST_DIR}) - endif() + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(ssl_root_path ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/no-asm) + else() + set(ssl_root_path ${CMAKE_CURRENT_FUNCTION_LIST_DIR}) + endif() - if (Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0) - list(APPEND android_extra_libs - ${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() - list(APPEND android_extra_libs - ${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) + if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0) + if(NOT OPENSSL_ROOT_DIR) + set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_3/${CMAKE_ANDROID_ARCH_ABI}) endif() + list(APPEND android_extra_libs + ${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() + if(NOT OPENSSL_ROOT_DIR) + set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_1.1/${CMAKE_ANDROID_ARCH_ABI}) + endif() + list(APPEND android_extra_libs + ${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) + endif() - set_target_properties(${ARGN} PROPERTIES - QT_ANDROID_EXTRA_LIBS "${android_extra_libs}") + set_target_properties(${ARGN} PROPERTIES QT_ANDROID_EXTRA_LIBS + "${android_extra_libs}") endfunction()