Verified Commit de4632cf authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Move server.[ch]pp to network subdirectory

parent e75b397d

src/CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -29,27 +29,27 @@ add_subdirectory(network) 
add_subdirectory(rpcs)



# scord daemon

add_executable(scord server.cpp scord.cpp)

add_executable(scord scord.cpp)



target_include_directories(

  scord PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}

)



target_link_libraries(

  scord PRIVATE config logger network_engine fmt::fmt Boost::program_options

  scord PRIVATE config logger rpc_server fmt::fmt Boost::program_options

)



install(TARGETS scord DESTINATION ${CMAKE_INSTALL_BINDIR})



# scord-ctl daemon

add_executable(scord-ctl server.cpp scord-ctl.cpp)

add_executable(scord-ctl scord-ctl.cpp)



target_include_directories(

  scord-ctl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}

)



target_link_libraries(

  scord-ctl PRIVATE config logger network_engine fmt::fmt Boost::program_options

  scord-ctl PRIVATE config logger rpc_server fmt::fmt Boost::program_options

)



install(TARGETS scord DESTINATION ${CMAKE_INSTALL_BINDIR})

src/network/CMakeLists.txt

+15 −0
Original line number Diff line number Diff line
@@ -35,3 +35,18 @@ target_link_libraries( 
                        Argobots::Argobots Margo::Margo

)

set_property(TARGET network_engine PROPERTY POSITION_INDEPENDENT_CODE ON)



add_library(rpc_server STATIC)

target_sources(

  rpc_server

  INTERFACE server.hpp

  PRIVATE server.cpp

)



target_include_directories(

  rpc_server

  INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}

  PRIVATE ${CMAKE_SOURCE_DIR}/src

)



target_link_libraries(rpc_server PUBLIC config network_engine)

src/server.cpp→src/network/server.cpp

+1 −1
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ 
#include <system_error>

#include <fmt/format.h>



#include <engine.hpp>

#include <server.hpp>

#include <config/settings.hpp>

#include <logger/logger.hpp>

#include <network/engine.hpp>

#include <utils/signal_listener.hpp>



namespace scord {

src/server.hpp→src/network/server.hpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#include <memory>

#include <atomic>

#include <network/engine.hpp>

#include <engine.hpp>



namespace scord {