CMake structuring completed

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 <threads>)
 
+find_package (Threads REQUIRED)
+target_link_libraries(asio INTERFACE Threads::Threads)
 
 add_subdirectory(src)
 

src/API/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_library(API OBJECT API.cpp API.hpp)
-

src/CMakeLists.txt

@@ -1,12 +1,7 @@
-add_subdirectory(Core)
+add_subdirectory(core)
-add_subdirectory(Storage)
+add_subdirectory(storage)
-add_subdirectory(Resolver)
+add_subdirectory(resolver)
-add_subdirectory(API)
+add_subdirectory(api)
-add_subdirectory(Cluster)
+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)
 
 

src/Cluster/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_library(Cluster OBJECT Cluster.cpp Cluster.hpp)
-

src/Core/CMakeLists.txt

@@ -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)

src/Core/Core.hpp

@@ -1 +0,0 @@
-#include "EventBus.hpp"

src/Resolver/CMakeLists.txt

@@ -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 <threads>)
-
-add_library(Resolver OBJECT Resolver.cpp Resolver.hpp)
-target_link_libraries(Resolver PRIVATE asio Core)
-

src/Storage/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_library(Storage OBJECT Storage.cpp Storage.hpp)
-

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)
+

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)

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)

src/core/include/Ledger.hpp

@@ -0,0 +1 @@
+class Ledger;

src/core/include/Resource.hpp

@@ -0,0 +1,2 @@
+# Provides an abstract class for resources that may be stored in the database
+class Resource;

src/core/include/Serialize.hpp

@@ -0,0 +1,10 @@
+#ifndef #SERIALIZE_HPP
+#define #SERIALIZE_HPP
+#include <string>
+using std::string;
+
+class  Serialize {
+    public:
+    virtual string Serialize() const = 0;
+}
+#endif

src/core/src/main.cpp

@@ -1,13 +1,13 @@
 #include <iostream>
-#include "Resolver/Resolver.hpp"
+//#include "resolver/Resolver.hpp"
-#include "Core/EventBus.hpp"
+#include "EventBus.hpp"
 
 int main(int args, char **argv) {
     using std::cout;
     using std::endl;
 
-    EventBus eventBus();
+      EventBus eventBus();
-    Resolver resolver();
+//    Resolver resolver();
 
     cout << "Hello there!" << endl;
 

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)

src/resolver/include/Resolver.hpp

@@ -1,4 +1,4 @@
-#include "Core/Core.hpp"
+#include "EventBus.hpp"
 
 class Resolver
 {

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)
+