Make core-buffer folder with all common stuff used in the buffer

CMakeLists.txt

@@ -28,6 +28,7 @@ add_subdirectory(
         ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
         EXCLUDE_FROM_ALL)
 
+add_subdirectory("core-buffer")
 add_subdirectory("core-writer")
 #add_subdirectory("csaxs")
 add_subdirectory("sf-writer")

core-buffer/CMakeLists.txt

@@ -0,0 +1,13 @@
+file(GLOB SOURCES
+        src/*.cpp)
+
+add_library(core-buffer STATIC ${SOURCES})
+target_include_directories(core-buffer PUBLIC include/)
+target_link_libraries(core-buffer core-writer)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    target_compile_definitions(core-buffer PRIVATE DEBUG_OUTPUT)
+endif()
+
+enable_testing()
+add_subdirectory(test/)

core-buffer/test/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_executable(core-buffer_tests test_main.cpp)
+
+target_link_libraries(core-buffer_tests
+        core-buffer
+        gtest)

core-buffer/test/test_buffer_utils.cpp

@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "../src/buffer_utils.hpp"
+#include "buffer_utils.hpp"
 
 using namespace std;
 

core-buffer/test/test_main.cpp

@@ -0,0 +1,11 @@
+#include "gtest/gtest.h"
+#include "test_UdpReceiver.cpp"
+#include "test_UdpRecvModule.cpp"
+#include "test_buffer_utils.cpp"
+
+using namespace std;
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}

core-writer/CMakeLists.txt

@@ -10,6 +10,7 @@ add_library(core-writer STATIC ${SOURCES})
 include_directories(core-writer external/)
 
 target_include_directories(core-writer PUBLIC include/)
+target_include_directories(core-writer PUBLIC external/)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     target_compile_definitions(core-writer PRIVATE DEBUG_OUTPUT)

core-writer/test/test_main.cpp

@@ -6,8 +6,6 @@
 #include "test_ZmqRecvModule.cpp"
 #include "test_H5WriteModule.cpp"
 #include "test_ProcessManager.cpp"
-#include "test_UdpReceiver.cpp"
-#include "test_UdpRecvModule.cpp"
 
 using namespace std;
 

sf-buffer/CMakeLists.txt

@@ -4,6 +4,7 @@ set_target_properties(sf-buffer PROPERTIES OUTPUT_NAME sf_buffer)
 target_include_directories(sf-buffer PUBLIC src/)
 
 target_link_libraries(sf-buffer
+        core-buffer
         core-writer
         external
         zmq

sf-buffer/test/test_main.cpp

@@ -1,5 +1,4 @@
 #include "gtest/gtest.h"
-#include "test_buffer_utils.cpp"
 
 using namespace std;