From 8f7e5e491f416869aa5838ab64f17bbae4b85cd3 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 11 Dec 2022 17:59:18 +0300 Subject: [PATCH] fixed macos openssl lib types --- client/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 83bd3f54..43a59b26 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) +SET(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/zlib) if(WIN32) set(ZLIB_LIBRARY $,zlibd,zlib>) @@ -83,8 +83,8 @@ if(NOT LINUX) set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/windows/x86/libcrypto.lib") endif() elseif(APPLE AND NOT IOS) - set(OPENSSL_LIB_SSL_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libssl.lib") - set(OPENSSL_LIB_CRYPTO_PATH "${OPENSSL_PATH}/lib/macos/x86_64/libcrypto.lib") + 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") endif() file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH} @@ -93,7 +93,7 @@ if(NOT LINUX) DESTINATION ${OPENSSL_ROOT_DIR}) endif() -set(WITH_EXAMPLES OFF) +SET(WITH_EXAMPLES OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh) add_compile_definitions(_WINSOCKAPI_) set(LIBS ${LIBS} ssh)