From a611ddea2d7cd1d4376105193c2d76ab67afa3ef Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <astanaar1@gmail.com>
Date: Tue, 13 Dec 2022 23:52:43 +0300
Subject: [PATCH] removed environment OPENSSL_ROOT_DIR variable

---
 client/CMakeLists.txt | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8171374c..04a460c3 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -56,7 +56,7 @@ set(LIBS ${LIBS} SortFilterProxyModel)
 include(${CMAKE_CURRENT_LIST_DIR}/3rd/qrcodegen/qrcodegen.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake)
 
-SET(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/zlib)
 if(WIN32)
     set(ZLIB_LIBRARY $<IF:$<CONFIG:Debug>,zlibd,zlib>)
@@ -69,7 +69,9 @@ link_libraries(${ZLIB_LIBRARY})
 
 if(NOT LINUX)
     set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/3rd/OpenSSL")
+    set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include")
     set(OPENSSL_LIBRARIES_DIR "${OPENSSL_ROOT_DIR}/lib")
+    set(OPENSSL_LIBRARIES "ssl" "crypto")
 
     set(OPENSSL_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL")
     if(WIN32)
@@ -88,23 +90,15 @@ if(NOT LINUX)
         set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/ios/iphone/libcrypto.a")
     endif()
 
-    if(NOT IOS)
-        file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
-            DESTINATION ${OPENSSL_LIBRARIES_DIR})
-        file(COPY "${OPENSSL_PATH}/include"
-            DESTINATION ${OPENSSL_ROOT_DIR})
-    else()
-        file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
-            DESTINATION ${OPENSSL_LIBRARIES_DIR}/ios)
-        file(COPY "${OPENSSL_PATH}/include"
-            DESTINATION ${OPENSSL_ROOT_DIR}/ios)
-    endif()
+    file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
+        DESTINATION ${OPENSSL_LIBRARIES_DIR})
+    file(COPY "${OPENSSL_PATH}/include"
+        DESTINATION ${OPENSSL_ROOT_DIR})
 
-    set(ENV{OPENSSL_ROOT_DIR} "${OPENSSL_ROOT_DIR}")
     find_package(OpenSSL REQUIRED)
 endif()
 
-SET(WITH_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(WITH_EXAMPLES OFF CACHE BOOL "" FORCE)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh)
 add_compile_definitions(_WINSOCKAPI_)
 set(LIBS ${LIBS} ssh)