From ce3664dc7f793cf207495a787cb77ed4acd08b3e Mon Sep 17 00:00:00 2001 From: Kambiz Asadzadeh Date: Tue, 15 Nov 2022 09:44:09 +0330 Subject: [PATCH] Update CMakeLists.txt --- CMakeLists.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0422ff1..fefc66b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,34 +100,30 @@ else() endif() endif() endif() - -#Added Qt6 support via QT_ANDROID_EXTRA_LIBS -# 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(QT_VERSION GREATER_EQUAL 6) if (CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a") - set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS + set_property(TARGET ${PROJECT_NAME} APPEND 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 (CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a") - set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS + set_property(TARGET ${PROJECT_NAME} APPEND 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 (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86") - set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS + set_property(TARGET ${PROJECT_NAME} APPEND 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 (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64") - set_property(TARGET ${PROJECT_NAME} PROPERTY QT_ANDROID_EXTRA_LIBS + set_property(TARGET ${PROJECT_NAME} APPEND 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 )