From bb80f8fb93a35a98b3e275418098ebf7c905107c Mon Sep 17 00:00:00 2001 From: Suraxius Date: Tue, 1 Dec 2020 23:45:29 +0100 Subject: [PATCH] WIP --- CMakeLists.txt | 7 +++++++ README.md | 19 +++++++++++++++++++ src/CMakeLists.txt | 4 ---- src/Core/CMakeLists.txt | 9 ++++++++- src/Core/Core.cpp | 0 src/Core/Core.hpp | 1 + src/Core/EventBus.cpp | 3 +++ src/Core/EventBus.hpp | 6 ++++++ src/Resolver/CMakeLists.txt | 2 +- src/Resolver/Resolver.hpp | 2 ++ src/main.cpp | 2 ++ 11 files changed, 49 insertions(+), 6 deletions(-) delete mode 100644 src/Core/Core.cpp create mode 100644 src/Core/EventBus.cpp create mode 100644 src/Core/EventBus.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index fadb409..eee7750 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,5 +2,12 @@ cmake_minimum_required(VERSION 3.16) project(distrins) +add_library(asio INTERFACE) +target_compile_options(asio INTERFACE -D ASIO_STANDALONE) +#target_include_directories(asio INTERFACE ${CMAKE_SOURCE_DIR}/lib/asio/include) +target_include_directories(asio INTERFACE lib/asio/include) +target_link_libraries(asio INTERFACE ) + + add_subdirectory(src) diff --git a/README.md b/README.md index d762874..319adfa 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,21 @@ # DistriNS A Distributed approach to Authoritative DNS + +## Coding Style + +### Classes +- LargeCamelCase + +#### Methods +- LargeCammelCase + +#### Properties/Variables +- smallCammelCase + +### Files + +#### Source Files +- LargeCammelCase.cpp + +#### Header Files +- LargeCamelCase.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 11c28be..1bcdae7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,12 +5,8 @@ add_subdirectory(API) add_subdirectory(Cluster) #find_package (Threads REQUIRED) #find pthreads package - #target_link_libraries (distrins ${CMAKE_THREAD_LIBS_INIT}) #link against pthreads add_executable(Distrins main.cpp Core Storage Resolver API Cluster) -#install(TARGETS myapp DESTINATION bin) - - diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt index 0df90bc..226dc70 100644 --- a/src/Core/CMakeLists.txt +++ b/src/Core/CMakeLists.txt @@ -1,2 +1,9 @@ -add_library(Core OBJECT Core.cpp Core.hpp) +add_library(Core INTERFACE) + +add_library(EventBus OBJECT EventBus.cpp EventBus.hpp) + +#target_sources(Core INTERFACE Core.hpp EventBus) + +target_include_directories(Core INTERFACE .) +target_link_libraries(Core INTERFACE EventBus) diff --git a/src/Core/Core.cpp b/src/Core/Core.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/src/Core/Core.hpp b/src/Core/Core.hpp index e69de29..1091744 100644 --- a/src/Core/Core.hpp +++ b/src/Core/Core.hpp @@ -0,0 +1 @@ +#include "EventBus.hpp" diff --git a/src/Core/EventBus.cpp b/src/Core/EventBus.cpp new file mode 100644 index 0000000..0c45440 --- /dev/null +++ b/src/Core/EventBus.cpp @@ -0,0 +1,3 @@ +#include "EventBus.hpp" + +EventBus::EventBus() {}; diff --git a/src/Core/EventBus.hpp b/src/Core/EventBus.hpp new file mode 100644 index 0000000..6f4f8df --- /dev/null +++ b/src/Core/EventBus.hpp @@ -0,0 +1,6 @@ +class EventBus { + public: + EventBus(); +}; + + diff --git a/src/Resolver/CMakeLists.txt b/src/Resolver/CMakeLists.txt index d8864e2..ec6d7f7 100644 --- a/src/Resolver/CMakeLists.txt +++ b/src/Resolver/CMakeLists.txt @@ -4,5 +4,5 @@ #target_link_libraries(asio INTERFACE ) add_library(Resolver OBJECT Resolver.cpp Resolver.hpp) -target_link_libraries(Resolver PRIVATE asio) +target_link_libraries(Resolver PRIVATE asio Core) diff --git a/src/Resolver/Resolver.hpp b/src/Resolver/Resolver.hpp index 4517254..2b47be2 100644 --- a/src/Resolver/Resolver.hpp +++ b/src/Resolver/Resolver.hpp @@ -1,3 +1,5 @@ +#include "Core/Core.hpp" + class Resolver { public: diff --git a/src/main.cpp b/src/main.cpp index 0fd0d24..314f7e8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,10 +1,12 @@ #include #include "Resolver/Resolver.hpp" +#include "Core/EventBus.hpp" int main(int args, char **argv) { using std::cout; using std::endl; + EventBus eventBus(); Resolver resolver(); cout << "Hello there!" << endl;