From 4106c67326ebada3c35b59640b49625fd85b8d2d Mon Sep 17 00:00:00 2001 From: Suraxius Date: Thu, 3 Dec 2020 21:17:08 +0100 Subject: [PATCH] CMake structuring completed --- CMakeLists.txt | 4 ++-- src/API/CMakeLists.txt | 2 -- src/CMakeLists.txt | 15 +++++---------- src/Cluster/CMakeLists.txt | 2 -- src/Core/CMakeLists.txt | 9 --------- src/Core/Core.hpp | 1 - src/Resolver/CMakeLists.txt | 8 -------- src/Storage/CMakeLists.txt | 2 -- src/api/CMakeLists.txt | 8 ++++++++ src/{API => api/include}/API.hpp | 0 src/{API => api/src}/API.cpp | 0 src/cluster/CMakeLists.txt | 7 +++++++ src/{Cluster => cluster/include}/Cluster.hpp | 0 src/{Cluster => cluster/src}/Cluster.cpp | 0 src/core/CMakeLists.txt | 16 ++++++++++++++++ src/{Core => core/include}/EventBus.hpp | 0 src/core/include/Ledger.hpp | 1 + .../Storage.cpp => core/include/PublicKey.hpp} | 0 src/core/include/Resource.hpp | 2 ++ src/core/include/Serialize.hpp | 10 ++++++++++ src/{Core => core/src}/EventBus.cpp | 0 src/{ => core/src}/main.cpp | 8 ++++---- src/resolver/CMakeLists.txt | 10 ++++++++++ src/{Resolver => resolver/include}/Resolver.hpp | 2 +- src/{Resolver => resolver/src}/Resolver.cpp | 0 src/storage/CMakeLists.txt | 8 ++++++++ src/{Storage => storage/include}/Storage.hpp | 0 src/storage/src/Storage.cpp | 0 28 files changed, 74 insertions(+), 41 deletions(-) delete mode 100644 src/API/CMakeLists.txt delete mode 100644 src/Cluster/CMakeLists.txt delete mode 100644 src/Core/CMakeLists.txt delete mode 100644 src/Core/Core.hpp delete mode 100644 src/Resolver/CMakeLists.txt delete mode 100644 src/Storage/CMakeLists.txt create mode 100644 src/api/CMakeLists.txt rename src/{API => api/include}/API.hpp (100%) rename src/{API => api/src}/API.cpp (100%) create mode 100644 src/cluster/CMakeLists.txt rename src/{Cluster => cluster/include}/Cluster.hpp (100%) rename src/{Cluster => cluster/src}/Cluster.cpp (100%) create mode 100644 src/core/CMakeLists.txt rename src/{Core => core/include}/EventBus.hpp (100%) create mode 100644 src/core/include/Ledger.hpp rename src/{Storage/Storage.cpp => core/include/PublicKey.hpp} (100%) create mode 100644 src/core/include/Resource.hpp create mode 100644 src/core/include/Serialize.hpp rename src/{Core => core/src}/EventBus.cpp (100%) rename src/{ => core/src}/main.cpp (57%) create mode 100644 src/resolver/CMakeLists.txt rename src/{Resolver => resolver/include}/Resolver.hpp (66%) rename src/{Resolver => resolver/src}/Resolver.cpp (100%) create mode 100644 src/storage/CMakeLists.txt rename src/{Storage => storage/include}/Storage.hpp (100%) create mode 100644 src/storage/src/Storage.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index eee7750..b8fa0f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,10 +4,10 @@ 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 ) +find_package (Threads REQUIRED) +target_link_libraries(asio INTERFACE Threads::Threads) add_subdirectory(src) diff --git a/src/API/CMakeLists.txt b/src/API/CMakeLists.txt deleted file mode 100644 index 21f03e7..0000000 --- a/src/API/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_library(API OBJECT API.cpp API.hpp) - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1bcdae7..a8eacd5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,12 +1,7 @@ -add_subdirectory(Core) -add_subdirectory(Storage) -add_subdirectory(Resolver) -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) +add_subdirectory(core) +add_subdirectory(storage) +add_subdirectory(resolver) +add_subdirectory(api) +add_subdirectory(cluster) diff --git a/src/Cluster/CMakeLists.txt b/src/Cluster/CMakeLists.txt deleted file mode 100644 index f0e2ebe..0000000 --- a/src/Cluster/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_library(Cluster OBJECT Cluster.cpp Cluster.hpp) - diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt deleted file mode 100644 index 226dc70..0000000 --- a/src/Core/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ - -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.hpp b/src/Core/Core.hpp deleted file mode 100644 index 1091744..0000000 --- a/src/Core/Core.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "EventBus.hpp" diff --git a/src/Resolver/CMakeLists.txt b/src/Resolver/CMakeLists.txt deleted file mode 100644 index ec6d7f7..0000000 --- a/src/Resolver/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -#add_library(asio INTERFACE) -#target_compile_options(asio INTERFACE -D ASIO_STANDALONE) -#target_include_directories(asio INTERFACE ${CMAKE_SOURCE_DIR}/lib/asio/include) -#target_link_libraries(asio INTERFACE ) - -add_library(Resolver OBJECT Resolver.cpp Resolver.hpp) -target_link_libraries(Resolver PRIVATE asio Core) - diff --git a/src/Storage/CMakeLists.txt b/src/Storage/CMakeLists.txt deleted file mode 100644 index b2a0b09..0000000 --- a/src/Storage/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_library(Storage OBJECT Storage.cpp Storage.hpp) - diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt new file mode 100644 index 0000000..c52183c --- /dev/null +++ b/src/api/CMakeLists.txt @@ -0,0 +1,8 @@ +add_library(API OBJECT) + +target_sources(API PRIVATE src) + +target_include_directories(API + PUBLIC include + PRIVATE src) + diff --git a/src/API/API.hpp b/src/api/include/API.hpp similarity index 100% rename from src/API/API.hpp rename to src/api/include/API.hpp diff --git a/src/API/API.cpp b/src/api/src/API.cpp similarity index 100% rename from src/API/API.cpp rename to src/api/src/API.cpp diff --git a/src/cluster/CMakeLists.txt b/src/cluster/CMakeLists.txt new file mode 100644 index 0000000..d391807 --- /dev/null +++ b/src/cluster/CMakeLists.txt @@ -0,0 +1,7 @@ +add_library(Cluster OBJECT) + +target_sources(Cluster PRIVATE src) + +target_include_directories(Cluster + PUBLIC include + PRIVATE src) diff --git a/src/Cluster/Cluster.hpp b/src/cluster/include/Cluster.hpp similarity index 100% rename from src/Cluster/Cluster.hpp rename to src/cluster/include/Cluster.hpp diff --git a/src/Cluster/Cluster.cpp b/src/cluster/src/Cluster.cpp similarity index 100% rename from src/Cluster/Cluster.cpp rename to src/cluster/src/Cluster.cpp diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt new file mode 100644 index 0000000..d9a6ab5 --- /dev/null +++ b/src/core/CMakeLists.txt @@ -0,0 +1,16 @@ + +add_library(Core OBJECT) + +target_sources(Core PRIVATE src) + +target_include_directories(Core + PUBLIC include + PRIVATE src) + +#add_library(EventBus OBJECT EventBus.cpp EventBus.hpp) +#target_link_libraries(Core INTERFACE EventBus) + + +# Assemble: +add_executable(Distrins src/main.cpp) +target_link_libraries(Distrins PRIVATE Core Storage Resolver API Cluster) diff --git a/src/Core/EventBus.hpp b/src/core/include/EventBus.hpp similarity index 100% rename from src/Core/EventBus.hpp rename to src/core/include/EventBus.hpp diff --git a/src/core/include/Ledger.hpp b/src/core/include/Ledger.hpp new file mode 100644 index 0000000..678e4a7 --- /dev/null +++ b/src/core/include/Ledger.hpp @@ -0,0 +1 @@ +class Ledger; diff --git a/src/Storage/Storage.cpp b/src/core/include/PublicKey.hpp similarity index 100% rename from src/Storage/Storage.cpp rename to src/core/include/PublicKey.hpp diff --git a/src/core/include/Resource.hpp b/src/core/include/Resource.hpp new file mode 100644 index 0000000..94332e7 --- /dev/null +++ b/src/core/include/Resource.hpp @@ -0,0 +1,2 @@ +# Provides an abstract class for resources that may be stored in the database +class Resource; diff --git a/src/core/include/Serialize.hpp b/src/core/include/Serialize.hpp new file mode 100644 index 0000000..423f25a --- /dev/null +++ b/src/core/include/Serialize.hpp @@ -0,0 +1,10 @@ +#ifndef #SERIALIZE_HPP +#define #SERIALIZE_HPP +#include +using std::string; + +class Serialize { + public: + virtual string Serialize() const = 0; +} +#endif diff --git a/src/Core/EventBus.cpp b/src/core/src/EventBus.cpp similarity index 100% rename from src/Core/EventBus.cpp rename to src/core/src/EventBus.cpp diff --git a/src/main.cpp b/src/core/src/main.cpp similarity index 57% rename from src/main.cpp rename to src/core/src/main.cpp index 314f7e8..813ec14 100644 --- a/src/main.cpp +++ b/src/core/src/main.cpp @@ -1,13 +1,13 @@ #include -#include "Resolver/Resolver.hpp" -#include "Core/EventBus.hpp" +//#include "resolver/Resolver.hpp" +#include "EventBus.hpp" int main(int args, char **argv) { using std::cout; using std::endl; - EventBus eventBus(); - Resolver resolver(); + EventBus eventBus(); +// Resolver resolver(); cout << "Hello there!" << endl; diff --git a/src/resolver/CMakeLists.txt b/src/resolver/CMakeLists.txt new file mode 100644 index 0000000..ed2b858 --- /dev/null +++ b/src/resolver/CMakeLists.txt @@ -0,0 +1,10 @@ + +add_library(Resolver OBJECT) + +target_sources(Resolver PRIVATE src) + +target_include_directories(Resolver + PUBLIC include + PRIVATE src) + +target_link_libraries(Resolver PRIVATE asio Core) diff --git a/src/Resolver/Resolver.hpp b/src/resolver/include/Resolver.hpp similarity index 66% rename from src/Resolver/Resolver.hpp rename to src/resolver/include/Resolver.hpp index 2b47be2..9cca604 100644 --- a/src/Resolver/Resolver.hpp +++ b/src/resolver/include/Resolver.hpp @@ -1,4 +1,4 @@ -#include "Core/Core.hpp" +#include "EventBus.hpp" class Resolver { diff --git a/src/Resolver/Resolver.cpp b/src/resolver/src/Resolver.cpp similarity index 100% rename from src/Resolver/Resolver.cpp rename to src/resolver/src/Resolver.cpp diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt new file mode 100644 index 0000000..26c4559 --- /dev/null +++ b/src/storage/CMakeLists.txt @@ -0,0 +1,8 @@ +add_library(Storage OBJECT) + +target_sources(Storage PRIVATE src) + +target_include_directories(Storage + PUBLIC include + PRIVATE src) + diff --git a/src/Storage/Storage.hpp b/src/storage/include/Storage.hpp similarity index 100% rename from src/Storage/Storage.hpp rename to src/storage/include/Storage.hpp diff --git a/src/storage/src/Storage.cpp b/src/storage/src/Storage.cpp new file mode 100644 index 0000000..e69de29