From b68c6b680762a77c3621b931a352d6d83ae6bb65 Mon Sep 17 00:00:00 2001
From: Dmitriy Karpushin <kolobchanin@gmail.com>
Date: Mon, 13 Feb 2023 10:42:47 +0300
Subject: [PATCH] Little refactoring

---
 client/CMakeLists.txt       |  2 ++
 client/cmake/3rdparty.cmake | 24 +++++++++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index ee29d54c..e913c370 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -11,6 +11,8 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
 endif()
 
 if(ANDROID)
+    # For a some reason cmake do not applying GNU_SOURCE/BSD_SOURCE flags on Android platform.
+    # We have to do this manually for building of libssh.
     add_definitions(-D_BSD_SOURCE)
 endif()
 
diff --git a/client/cmake/3rdparty.cmake b/client/cmake/3rdparty.cmake
index b35570e6..6549e6e8 100644
--- a/client/cmake/3rdparty.cmake
+++ b/client/cmake/3rdparty.cmake
@@ -47,6 +47,15 @@ if(NOT LINUX)
         set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/libssl.a")
         set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/ios/iphone/libssl.a")
         set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/ios/iphone/libcrypto.a")
+    elseif(ANDROID)
+        set(abi ${CMAKE_ANDROID_ARCH_ABI})
+
+        set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libcrypto.a")
+        set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libssl.a")
+        set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/android/${abi}/libssl.a")
+        set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/android/${abi}/libcrypto.a")
+
+        set(OPENSSL_LIBRARIES_DIR "${OPENSSL_LIBRARIES_DIR}/android/${abi}")
     endif()
 
     file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
@@ -55,21 +64,6 @@ if(NOT LINUX)
         DESTINATION ${OPENSSL_ROOT_DIR})
 endif()
 
-if(ANDROID)
-    set(abi ${CMAKE_ANDROID_ARCH_ABI})
-
-    set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libcrypto.a")
-    set(OPENSSL_SSL_LIBRARY "${OPENSSL_LIBRARIES_DIR}/android/${abi}/libssl.a")
-    set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/android/${abi}/libssl.a")
-    set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/android/${abi}/libcrypto.a")
-
-    file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
-        DESTINATION "${OPENSSL_LIBRARIES_DIR}/android/${abi}")
-    file(COPY "${OPENSSL_PATH}/include"
-        DESTINATION ${OPENSSL_ROOT_DIR})
-
-endif()
-
 set(OPENSSL_USE_STATIC_LIBS TRUE)
 find_package(OpenSSL REQUIRED)
 set(LIBS ${LIBS}