From bd22e330a77346553d43f69101d9729eb2623965 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sat, 17 Dec 2022 22:02:38 +0300 Subject: [PATCH] set OPENSSL_CRYPTO_LIBRARY for ios - removed linking with brew openssl for ios --- client/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 18b6f4fd..e564525c 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -67,7 +67,7 @@ set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/3rd/zlib" "${CMAKE_CURRENT_BINAR link_directories(${CMAKE_CURRENT_BINARY_DIR}/3rd/zlib) link_libraries(${ZLIB_LIBRARY}) -if(NOT LINUX AND NOT IOS) +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") @@ -86,6 +86,7 @@ if(NOT LINUX AND NOT IOS) set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libssl.a") set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libcrypto.a") elseif(IOS) + set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_LIBRARIES_DIR}/libcrypto.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") endif() @@ -94,12 +95,6 @@ if(NOT LINUX AND NOT IOS) DESTINATION ${OPENSSL_LIBRARIES_DIR}) file(COPY "${OPENSSL_PATH}/include" DESTINATION ${OPENSSL_ROOT_DIR}) -elseif(IOS) - set(BREW_OPENSSL_PREFIX "/opt/homebrew/opt/openssl@1.1") - set(OPENSSL_ROOT_DIR "${BREW_OPENSSL_PREFIX}") - set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include") - set(OPENSSL_LIBRARIES_DIR "${OPENSSL_ROOT_DIR}/lib") - set(OPENSSL_LIBRARIES "ssl" "crypto") endif() set(OPENSSL_USE_STATIC_LIBS TRUE)