AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added copying OpenSSL libraries, for windows and macos, to the folder with binaries, because we have the wrong folder structure with the OpenSSL library

Browse source
This commit is contained in:
vladimir.kuznetsov 2022-12-08 21:40:51 +03:00
parent 3742583508
commit a8fc42a17e
2 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

39
client/CMakeLists.txt
View file

@ -37,17 +37,40 @@ set(LIBS ${LIBS} SortFilterProxyModel)
include(${CMAKE_CURRENT_LIST_DIR}/3rd/qrcodegen/qrcodegen.cmake) include(${CMAKE_CURRENT_LIST_DIR}/3rd/qrcodegen/qrcodegen.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake) include(${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/zlib) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/zlib)
set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/3rd/zlib) set(ZLIB_LIBRARY $<IF:$<CONFIG:Debug>,zlibd,zlib>)
set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/3rd/zlib) set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/3rd/zlib" "${CMAKE_CURRENT_BINARY_DIR}/3rd/zlib")
set(WITH_SERVER OFF) link_directories(${CMAKE_CURRENT_BINARY_DIR}/3rd/zlib)
set(WITH_GSSAPI OFF)
set(WITH_EXAMPLES OFF) set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/3rd/OpenSSL")
set(OPENSSL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include) set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include")
set(OPENSSL_LIBRARIES_DIR "${OPENSSL_ROOT_DIR}/lib")
set(OPENSSL_LIBRARIES "ssl" "crypto")
if(WIN32)
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(OPENSSL_LIB_SSL_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/windows/x86_64/libssl.lib")
set(OPENSSL_LIB_CRYPTO_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/windows/x86_64/libcrypto.lib")
else()
set(OPENSSL_LIB_SSL_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/windows/x86/libssl.lib")
set(OPENSSL_LIB_CRYPTO_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/windows/x86/libcrypto.lib")
endif()
elseif(APPLE AND NOT IOS)
set(OPENSSL_LIB_SSL_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/macos/x86_64/libssl.lib")
set(OPENSSL_LIB_CRYPTO_PATH "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/lib/macos/x86_64/libcrypto.lib")
endif()
file(COPY ${OPENSSL_LIB_SSL_PATH} ${OPENSSL_LIB_CRYPTO_PATH}
DESTINATION ${OPENSSL_LIBRARIES_DIR})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include"
DESTINATION ${OPENSSL_ROOT_DIR})
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/libssh)
add_compile_definitions(_WINSOCKAPI_)
set(LIBS ${LIBS} ssh)
set(BUILD_WITH_QT6 ON) set(BUILD_WITH_QT6 ON)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain)
set(LIBS ${LIBS} qt6keychain) set(LIBS ${LIBS} qt6keychain)
@ -56,9 +79,11 @@ include_directories(
${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include ${CMAKE_CURRENT_LIST_DIR}/3rd/OpenSSL/include
${CMAKE_CURRENT_LIST_DIR}/../ipc ${CMAKE_CURRENT_LIST_DIR}/../ipc
${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain ${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain
${CMAKE_CURRENT_LIST_DIR}/3rd/libssh/include
${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain ${CMAKE_CURRENT_BINARY_DIR}/3rd/qtkeychain
${CMAKE_CURRENT_BINARY_DIR}/3rd/libssh/include
) )
set(HEADERS ${HEADERS} set(HEADERS ${HEADERS}

6
service/server/CMakeLists.txt
View file

@ -99,12 +99,12 @@ endif()
# deploy artifacts required to run the application to the debug build folder # deploy artifacts required to run the application to the debug build folder
if(LINUX) if(LINUX)
set(DEPLOY_ARTIFACT_PATH "linux/service") set(DEPLOY_ARTIFACT_PATH "linux/service")
endif()
add_custom_command( add_custom_command(
TARGET ${PROJECT} POST_BUILD TARGET ${PROJECT} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true> COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH} ${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH}
$<TARGET_FILE_DIR:${PROJECT}> $<TARGET_FILE_DIR:${PROJECT}>
COMMAND_EXPAND_LISTS COMMAND_EXPAND_LISTS
) )
endif()