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

added files for linux and mac to CMakeLists for server and wireguard-service projects

Browse source
This commit is contained in:
vladimir.kuznetsov 2022-11-08 21:32:17 +03:00
parent 16e26ef215
commit aea1d16e31
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
service/CMakeLists.txt
View file

@ -6,10 +6,12 @@ project(${PROJECT})
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT IOS AND NOT ANDROID)
#include(common.cmake)
#if (qtservice-uselib) #if (qtservice-uselib)
include(common.cmake)
# add_subdirectory(buildlib) # add_subdirectory(buildlib)
add_subdirectory(server)
#endif() #endif()
add_subdirectory(server)
endif()
add_subdirectory(wireguard-service) add_subdirectory(wireguard-service)

24
service/server/CMakeLists.txt
View file

@ -56,8 +56,28 @@ if(WIN32)
add_compile_definitions(_WINSOCKAPI_) add_compile_definitions(_WINSOCKAPI_)
endif() endif()
#TODO migrate macx
#TODO migrate linux if(APPLE)
set(HEADERS ${HEADERS}
${CMAKE_CURRENT_LIST_DIR}/helper_route_mac.h
${CMAKE_CURRENT_LIST_DIR}/router_mac.h
)
set(SOURCES ${SOURCES}
${CMAKE_CURRENT_LIST_DIR}/helper_route_mac.c
${CMAKE_CURRENT_LIST_DIR}/router_mac.cpp
)
endif()
if(LINUX)
set(HEADERS ${HEADERS}
${CMAKE_CURRENT_LIST_DIR}/router_linux.h
)
set(SOURCES ${SOURCES}
${CMAKE_CURRENT_LIST_DIR}/router_linux.cpp
)
endif()
include(${CMAKE_CURRENT_LIST_DIR}/../src/qtservice.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../src/qtservice.cmake)

15
service/src/qtservice.cmake
View file

@ -1,6 +1,6 @@
include_directories(${CMAKE_CURRENT_LIST_DIR}) include_directories(${CMAKE_CURRENT_LIST_DIR})
include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake) #include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
if(NOT WIN32) if(NOT WIN32)
set(LIBS ${LIBS} Qt6::Network) set(LIBS ${LIBS} Qt6::Network)
@ -17,6 +17,19 @@ set(SOURCES ${SOURCES}
${CMAKE_CURRENT_LIST_DIR}/qtservice.cpp ${CMAKE_CURRENT_LIST_DIR}/qtservice.cpp
) )
if(UNIX)
set(HEADERS ${HEADERS}
${CMAKE_CURRENT_LIST_DIR}/qtunixsocket.h
${CMAKE_CURRENT_LIST_DIR}/qtunixserversocket.h
)
set(SOURCES ${SOURCES}
${CMAKE_CURRENT_LIST_DIR}/qtservice_unix.cpp
${CMAKE_CURRENT_LIST_DIR}/qtunixsocket.cpp
${CMAKE_CURRENT_LIST_DIR}/qtunixserversocket.cpp
)
endif()
if(WIN32) if(WIN32)
set(SOURCES ${SOURCES} set(SOURCES ${SOURCES}
${CMAKE_CURRENT_LIST_DIR}/qtservice_win.cpp ${CMAKE_CURRENT_LIST_DIR}/qtservice_win.cpp