diff --git a/CMakeLists.txt b/CMakeLists.txt index de0bde1..0422ff1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,21 +7,21 @@ endif() if (QT_VERSION LESS 5.12.4) message(QT_VERSION) - if (ANDROID_TARGET_ARCH STREQUAL "armeabi-v7a") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/Qt-5.12.3/arm/libcrypto.so ${SSL_ROOT_PATH}/Qt-5.12.3/arm/libssl.so CACHE INTERNAL "") endif() - if (ANDROID_TARGET_ARCH STREQUAL "arm64-v8a") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/Qt-5.12.3/arm64/libcrypto.so ${SSL_ROOT_PATH}/Qt-5.12.3/arm64/libssl.so CACHE INTERNAL "") endif() - if (ANDROID_TARGET_ARCH STREQUAL "x86") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/Qt-5.12.3/x86/libcrypto.so ${SSL_ROOT_PATH}/Qt-5.12.3/x86/libssl.so @@ -29,28 +29,28 @@ if (QT_VERSION LESS 5.12.4) endif() else() if (QT_VERSION EQUAL 5.12.4 OR QT_VERSION EQUAL 5.13.0) - if (ANDROID_TARGET_ARCH STREQUAL "armeabi-v7a") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/Qt-5.12.4_5.13.0/arm/libcrypto.so ${SSL_ROOT_PATH}/Qt-5.12.4_5.13.0/arm/libssl.so CACHE INTERNAL "") endif() - if (ANDROID_TARGET_ARCH STREQUAL "arm64-v8a") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/Qt-5.12.4_5.13.0/arm64/libcrypto.so ${SSL_ROOT_PATH}/Qt-5.12.4_5.13.0/arm64/libssl.so CACHE INTERNAL "") endif() - if (ANDROID_TARGET_ARCH STREQUAL "x86") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/Qt-5.12.4_5.13.0/x86/libcrypto.so ${SSL_ROOT_PATH}/Qt-5.12.4_5.13.0/x86/libssl.so CACHE INTERNAL "") endif() - if (ANDROID_TARGET_ARCH STREQUAL "x86_64") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/Qt-5.12.4_5.13.0/x86_64/libcrypto.so ${SSL_ROOT_PATH}/Qt-5.12.4_5.13.0/x86_64/libssl.so @@ -70,28 +70,28 @@ else() ${SSL_ROOT_PATH}/latest/x86_64/libssl_1_1.so CACHE INTERNAL "") else() - if (ANDROID_TARGET_ARCH STREQUAL "armeabi-v7a") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/latest/arm/libcrypto_1_1.so ${SSL_ROOT_PATH}/latest/arm/libssl_1_1.so CACHE INTERNAL "") endif() - if (ANDROID_TARGET_ARCH STREQUAL "arm64-v8a") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/latest/arm64/libcrypto_1_1.so ${SSL_ROOT_PATH}/latest/arm64/libssl_1_1.so CACHE INTERNAL "") endif() - if (ANDROID_TARGET_ARCH STREQUAL "x86") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/latest/x86/libcrypto_1_1.so ${SSL_ROOT_PATH}/latest/x86/libssl_1_1.so CACHE INTERNAL "") endif() - if (ANDROID_TARGET_ARCH STREQUAL "x86_64") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64") set(ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/latest/x86_64/libcrypto_1_1.so ${SSL_ROOT_PATH}/latest/x86_64/libssl_1_1.so @@ -105,28 +105,28 @@ endif() # With the recent update and the introduction of the QT_ANDROID_EXTRA_LIBS variable, this modification is necessary to copy the openssl files to the required path in Qt6. # https://doc.qt.io/qt-6/cmake-target-property-qt-android-extra-libs.html if(QT_VERSION GREATER 6.0.0) - if (ANDROID_TARGET_ARCH STREQUAL "armeabi-v7a") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a") set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/latest/arm/libcrypto_1_1.so ${SSL_ROOT_PATH}/latest/arm/libssl_1_1.so ) endif() - if (ANDROID_TARGET_ARCH STREQUAL "arm64-v8a") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/latest/arm64/libcrypto_1_1.so ${SSL_ROOT_PATH}/latest/arm64/libssl_1_1.so ) endif() - if (ANDROID_TARGET_ARCH STREQUAL "x86") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86") set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/latest/x86/libcrypto_1_1.so ${SSL_ROOT_PATH}/latest/x86/libssl_1_1.so ) endif() - if (ANDROID_TARGET_ARCH STREQUAL "x86_64") + if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64") set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS ${SSL_ROOT_PATH}/latest/x86_64/libcrypto_1_1.so ${SSL_ROOT_PATH}/latest/x86_64/libssl_1_1.so