diff --git a/client/3rd/QtSsh/src/botan/botan.cmake b/client/3rd/QtSsh/src/botan/botan.cmake index 0dce1f5e..24a35d1c 100644 --- a/client/3rd/QtSsh/src/botan/botan.cmake +++ b/client/3rd/QtSsh/src/botan/botan.cmake @@ -39,14 +39,12 @@ if(ANDROID) # As QAndroidBinder is not yet implemented with a public api set(LIBS ${LIBS} Qt6::CorePrivate) - message("botan target arch ${CMAKE_ANDROID_ARCH_ABI}") set(abi ${CMAKE_ANDROID_ARCH_ABI}) include_directories(${CMAKE_CURRENT_LIST_DIR}/android/${abi}) link_directories(${CMAKE_CURRENT_LIST_DIR}/android/${abi}) set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/android/${abi}/botan_all.h) set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/android/${abi}/botan_all.cpp) - endif() if(IOS) @@ -70,8 +68,4 @@ if(IOS) include_directories(${CMAKE_CURRENT_LIST_DIR}/ios/iphone) set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/ios/iphone/botan_all.h) set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/ios/iphone/botan_all.cpp) - - - - endif() diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index e78e03c9..8f84b25c 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -503,8 +503,8 @@ if(ANDROID) ${CMAKE_CURRENT_LIST_DIR}/android ) - foreach(abi IN LISTS ${QT_ANDROID_ABIS}) - if(ANDROID_TARGET_ARCH EQUAL ${abi}) + foreach(abi IN ITEMS ${QT_ANDROID_ABIS}) + if(CMAKE_ANDROID_ARCH_ABI STREQUAL ${abi}) set(LIBS ${LIBS} ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/android/${abi}/libcrypto.a ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/android/${abi}/libssl.a diff --git a/client/cmake/3rdparty.cmake b/client/cmake/3rdparty.cmake index 2fcfa9d1..a87b4df5 100644 --- a/client/cmake/3rdparty.cmake +++ b/client/cmake/3rdparty.cmake @@ -19,8 +19,8 @@ add_subdirectory(${CLIENT_ROOT_DIR}/3rd/qtkeychain) set(LIBS ${LIBS} qt6keychain) include_directories( - ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/include ${CLIENT_ROOT_DIR}/3rd/OpenSSL/include + ${CLIENT_ROOT_DIR}/3rd/QSimpleCrypto/include ${CLIENT_ROOT_DIR}/3rd/qtkeychain ${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain )