andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

added:

Browse Source 
- set PKG_CONFIG_PATH for openssl
- use find_package for precompiled openssl

removed:
- set CMAKE_PREFIX_PATH for openssl
- renaming ios openssl libs after copying to bin dir
This commit is contained in:
vladimir.kuznetsov
2022-12-13 21:39:02 +03:00
parent 61d502eea4
commit dafef6463a
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/CMakeLists.txt
+3 -6
View File
@@ -69,9 +69,7 @@ link_libraries(${ZLIB_LIBRARY})
if(NOT LINUX) if(NOT LINUX)
set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/3rd/OpenSSL") 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_DIR "${OPENSSL_ROOT_DIR}/lib")
set(OPENSSL_LIBRARIES "ssl" "crypto")
set(OPENSSL_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL") set(OPENSSL_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL")
if(WIN32) if(WIN32)
@@ -92,12 +90,11 @@ if(NOT LINUX)
file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH} file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
DESTINATION ${OPENSSL_LIBRARIES_DIR}) DESTINATION ${OPENSSL_LIBRARIES_DIR})
if(IOS)
file(RENAME ${OPENSSL_LIBRARIES_DIR}/libssl.a ${OPENSSL_LIBRARIES_DIR}/ssl.a)
file(RENAME ${OPENSSL_LIBRARIES_DIR}/libcrypto.a ${OPENSSL_LIBRARIES_DIR}/crypto.a)
endif()
file(COPY "${OPENSSL_PATH}/include" file(COPY "${OPENSSL_PATH}/include"
DESTINATION ${OPENSSL_ROOT_DIR}) DESTINATION ${OPENSSL_ROOT_DIR})
set(ENV{PKG_CONFIG_PATH} "${OPENSSL_ROOT_DIR}")
find_package(OpenSSL REQUIRED)
endif() endif()
SET(WITH_EXAMPLES OFF CACHE BOOL "" FORCE) SET(WITH_EXAMPLES OFF CACHE BOOL "" FORCE)