diff options
| author | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2020-06-02 17:21:09 +0800 |
|---|---|---|
| committer | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2020-06-02 17:21:09 +0800 |
| commit | 38e9d8eb7ff9f5547373c2cf7b4a612320c2b3f6 (patch) | |
| tree | 59d250d5b23bb897cc9d63ac7245e5fb7606d04e | |
| parent | c36999311ac73160716de72a153646aa7f8367eb (diff) | |
Update for Qt5.14.2
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| m--------- | qrtclient | 0 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 872eeb3..247144d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ if (ANDROID) ) target_link_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SYSROOT}/usr/lib/${ANDROID_TOOLCHAIN_NAME}/${ANDROID_NATIVE_API_LEVEL} - /opt/Qt5.14.1/5.14.1/android/lib) + /opt/Qt5.14.2/5.14.2/android/lib) target_link_libraries(${PROJECT_NAME} qrtclient_${ANDROID_ABI}) set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") if (ANDROID_ABI STREQUAL "arm64-v8a") @@ -28,7 +28,7 @@ if (ANDROID) ${CMAKE_SYSROOT}/usr/lib/aarch64-linux-android/${ANDROID_NATIVE_API_LEVEL}/libssl_1_1.so ${CMAKE_SYSROOT}/usr/lib/aarch64-linux-android/${ANDROID_NATIVE_API_LEVEL}/libcurl.so ${CMAKE_SYSROOT}/usr/lib/aarch64-linux-android/${ANDROID_NATIVE_API_LEVEL}/librtclient.so - /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_${ANDROID_ABI}.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_${ANDROID_ABI}.so CACHE INTERNAL "") elseif (ANDROID_ABI STREQUAL "armeabi-v7a") set(ANDROID_EXTRA_LIBS @@ -36,7 +36,7 @@ if (ANDROID) ${CMAKE_SYSROOT}/usr/lib/arm-linux-androideabi/${ANDROID_NATIVE_API_LEVEL}/libssl_1_1.so ${CMAKE_SYSROOT}/usr/lib/arm-linux-androideabi/${ANDROID_NATIVE_API_LEVEL}/libcurl.so ${CMAKE_SYSROOT}/usr/lib/arm-linux-androideabi/${ANDROID_NATIVE_API_LEVEL}/librtclient.so - /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_${ANDROID_ABI}.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_${ANDROID_ABI}.so CACHE INTERNAL "") elseif (ANDROID_ABI STREQUAL "x86") set(ANDROID_EXTRA_LIBS @@ -44,7 +44,7 @@ if (ANDROID) ${CMAKE_SYSROOT}/usr/lib/i686-linux-android/${ANDROID_NATIVE_API_LEVEL}/libssl_1_1.so ${CMAKE_SYSROOT}/usr/lib/i686-linux-android/${ANDROID_NATIVE_API_LEVEL}/libcurl.so ${CMAKE_SYSROOT}/usr/lib/i686-linux-android/${ANDROID_NATIVE_API_LEVEL}/librtclient.so - /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_${ANDROID_ABI}.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_${ANDROID_ABI}.so CACHE INTERNAL "") elseif (ANDROID_ABI STREQUAL "x86_64") set(ANDROID_EXTRA_LIBS @@ -52,7 +52,7 @@ if (ANDROID) ${CMAKE_SYSROOT}/usr/lib/x86_64-linux-android/${ANDROID_NATIVE_API_LEVEL}/libssl_1_1.so ${CMAKE_SYSROOT}/usr/lib/x86_64-linux-android/${ANDROID_NATIVE_API_LEVEL}/libcurl.so ${CMAKE_SYSROOT}/usr/lib/x86_64-linux-android/${ANDROID_NATIVE_API_LEVEL}/librtclient.so - /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_${ANDROID_ABI}.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_${ANDROID_ABI}.so CACHE INTERNAL "") endif() else() diff --git a/qrtclient b/qrtclient -Subproject eabba16993fcd65d9473a2d134e43fff747d097 +Subproject cf6b6658aa3f477d57e094fd73898244e206993 |