changed project structure for future unit tests

lrlunin · Oct 31, 2024 · 2c29523 · 2c29523
1 parent 4a778bc
commit 2c29523
Show file tree

Hide file tree

Showing 37 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,5 +9,5 @@ set(CMAKE_CXX_FLAGS_DEBUG "-g")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 set(DEBUG_SRC_FILES "")
 
-add_subdirectory(src/tango-moenchzmq)
-add_subdirectory(src/tango-moenchcontrol)
+add_subdirectory(tango-moenchzmq)
+add_subdirectory(tango-moenchcontrol)
diff --git a/tango-moenchcontrol/CMakeLists.txt b/tango-moenchcontrol/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(src)
diff --git a/src/tango-moenchcontrol/CMakeLists.txt → tango-moenchcontrol/src/CMakeLists.txt b/src/tango-moenchcontrol/CMakeLists.txt → tango-moenchcontrol/src/CMakeLists.txt
@@ -6,11 +6,10 @@ find_package(ZeroMQ REQUIRED)
 find_package(Boost REQUIRED)
 find_package(slsDetectorPackage 8.0 REQUIRED)
 
-
 add_subdirectory(tangods)
 
 add_executable(MoenchControl ${MOENCHCONTROL_TANGODS_SRC_FILES})
 
 target_link_libraries(MoenchControl slsDetectorShared slsReceiverStatic Tango::Tango) 
 
-install(TARGETS MoenchControl DESTINATION bin)
+install(TARGETS MoenchControl DESTINATION bin)
diff --git a/...ango-moenchcontrol/tangods/CMakeLists.txt → ...-moenchcontrol/src/tangods/CMakeLists.txt b/...ango-moenchcontrol/tangods/CMakeLists.txt → ...-moenchcontrol/src/tangods/CMakeLists.txt
diff --git a/...go-moenchcontrol/tangods/ClassFactory.cpp → ...oenchcontrol/src/tangods/ClassFactory.cpp b/...go-moenchcontrol/tangods/ClassFactory.cpp → ...oenchcontrol/src/tangods/ClassFactory.cpp
diff --git a/...o-moenchcontrol/tangods/MoenchControl.cpp → ...enchcontrol/src/tangods/MoenchControl.cpp b/...o-moenchcontrol/tangods/MoenchControl.cpp → ...enchcontrol/src/tangods/MoenchControl.cpp
diff --git a/...ngo-moenchcontrol/tangods/MoenchControl.h → ...moenchcontrol/src/tangods/MoenchControl.h b/...ngo-moenchcontrol/tangods/MoenchControl.h → ...moenchcontrol/src/tangods/MoenchControl.h
diff --git a/...o-moenchcontrol/tangods/MoenchControl.xmi → ...enchcontrol/src/tangods/MoenchControl.xmi b/...o-moenchcontrol/tangods/MoenchControl.xmi → ...enchcontrol/src/tangods/MoenchControl.xmi
diff --git a/...nchcontrol/tangods/MoenchControlClass.cpp → ...ontrol/src/tangods/MoenchControlClass.cpp b/...nchcontrol/tangods/MoenchControlClass.cpp → ...ontrol/src/tangods/MoenchControlClass.cpp
diff --git a/...oenchcontrol/tangods/MoenchControlClass.h → ...hcontrol/src/tangods/MoenchControlClass.h b/...oenchcontrol/tangods/MoenchControlClass.h → ...hcontrol/src/tangods/MoenchControlClass.h
diff --git a/...rol/tangods/MoenchControlStateMachine.cpp → ...src/tangods/MoenchControlStateMachine.cpp b/...rol/tangods/MoenchControlStateMachine.cpp → ...src/tangods/MoenchControlStateMachine.cpp
diff --git a/src/tango-moenchcontrol/tangods/main.cpp → tango-moenchcontrol/src/tangods/main.cpp b/src/tango-moenchcontrol/tangods/main.cpp → tango-moenchcontrol/src/tangods/main.cpp
diff --git a/tango-moenchzmq/CMakeLists.txt b/tango-moenchzmq/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(src)
diff --git a/src/tango-moenchzmq/CMakeLists.txt → tango-moenchzmq/src/CMakeLists.txt b/src/tango-moenchzmq/CMakeLists.txt → tango-moenchzmq/src/CMakeLists.txt
diff --git a/src/tango-moenchzmq/backend/CMakeLists.txt → tango-moenchzmq/src/backend/CMakeLists.txt b/src/tango-moenchzmq/backend/CMakeLists.txt → tango-moenchzmq/src/backend/CMakeLists.txt
diff --git a/...enchzmq/backend/CPUComputationBackend.cpp → ...zmq/src/backend/CPUComputationBackend.cpp b/...enchzmq/backend/CPUComputationBackend.cpp → ...zmq/src/backend/CPUComputationBackend.cpp
diff --git a/...enchzmq/backend/CPUComputationBackend.hpp → ...zmq/src/backend/CPUComputationBackend.hpp b/...enchzmq/backend/CPUComputationBackend.hpp → ...zmq/src/backend/CPUComputationBackend.hpp
diff --git a/...tango-moenchzmq/backend/CUDAProcessing.cu → ...o-moenchzmq/src/backend/CUDAProcessing.cu b/...tango-moenchzmq/backend/CUDAProcessing.cu → ...o-moenchzmq/src/backend/CUDAProcessing.cu
diff --git a/...-moenchzmq/backend/ComputationBackend.hpp → ...nchzmq/src/backend/ComputationBackend.hpp b/...-moenchzmq/backend/ComputationBackend.hpp → ...nchzmq/src/backend/ComputationBackend.hpp
diff --git a/...ngo-moenchzmq/backend/ComputationTest.cpp → ...moenchzmq/src/backend/ComputationTest.cpp b/...ngo-moenchzmq/backend/ComputationTest.cpp → ...moenchzmq/src/backend/ComputationTest.cpp
diff --git a/src/tango-moenchzmq/backend/ExampleNexus.cpp → tango-moenchzmq/src/backend/ExampleNexus.cpp b/src/tango-moenchzmq/backend/ExampleNexus.cpp → tango-moenchzmq/src/backend/ExampleNexus.cpp
diff --git a/src/tango-moenchzmq/backend/FileWriter.hpp → tango-moenchzmq/src/backend/FileWriter.hpp b/src/tango-moenchzmq/backend/FileWriter.hpp → tango-moenchzmq/src/backend/FileWriter.hpp
diff --git a/src/tango-moenchzmq/backend/Frames.hpp → tango-moenchzmq/src/backend/Frames.hpp b/src/tango-moenchzmq/backend/Frames.hpp → tango-moenchzmq/src/backend/Frames.hpp
diff --git a/src/tango-moenchzmq/backend/HDFWriter.cpp → tango-moenchzmq/src/backend/HDFWriter.cpp b/src/tango-moenchzmq/backend/HDFWriter.cpp → tango-moenchzmq/src/backend/HDFWriter.cpp
diff --git a/src/tango-moenchzmq/backend/HDFWriter.hpp → tango-moenchzmq/src/backend/HDFWriter.hpp b/src/tango-moenchzmq/backend/HDFWriter.hpp → tango-moenchzmq/src/backend/HDFWriter.hpp
diff --git a/src/tango-moenchzmq/backend/ZMQListener.cpp → tango-moenchzmq/src/backend/ZMQListener.cpp b/src/tango-moenchzmq/backend/ZMQListener.cpp → tango-moenchzmq/src/backend/ZMQListener.cpp
diff --git a/src/tango-moenchzmq/backend/ZMQListener.hpp → tango-moenchzmq/src/backend/ZMQListener.hpp b/src/tango-moenchzmq/backend/ZMQListener.hpp → tango-moenchzmq/src/backend/ZMQListener.hpp
diff --git a/src/tango-moenchzmq/tangods/CMakeLists.txt → tango-moenchzmq/src/tangods/CMakeLists.txt b/src/tango-moenchzmq/tangods/CMakeLists.txt → tango-moenchzmq/src/tangods/CMakeLists.txt
diff --git a/src/tango-moenchzmq/tangods/ClassFactory.cpp → tango-moenchzmq/src/tangods/ClassFactory.cpp b/src/tango-moenchzmq/tangods/ClassFactory.cpp → tango-moenchzmq/src/tangods/ClassFactory.cpp
diff --git a/src/tango-moenchzmq/tangods/MoenchZMQ.cpp → tango-moenchzmq/src/tangods/MoenchZMQ.cpp b/src/tango-moenchzmq/tangods/MoenchZMQ.cpp → tango-moenchzmq/src/tangods/MoenchZMQ.cpp
diff --git a/src/tango-moenchzmq/tangods/MoenchZMQ.h → tango-moenchzmq/src/tangods/MoenchZMQ.h b/src/tango-moenchzmq/tangods/MoenchZMQ.h → tango-moenchzmq/src/tangods/MoenchZMQ.h
diff --git a/src/tango-moenchzmq/tangods/MoenchZMQ.xmi → tango-moenchzmq/src/tangods/MoenchZMQ.xmi b/src/tango-moenchzmq/tangods/MoenchZMQ.xmi → tango-moenchzmq/src/tangods/MoenchZMQ.xmi
diff --git a/...ango-moenchzmq/tangods/MoenchZMQClass.cpp → ...-moenchzmq/src/tangods/MoenchZMQClass.cpp b/...ango-moenchzmq/tangods/MoenchZMQClass.cpp → ...-moenchzmq/src/tangods/MoenchZMQClass.cpp
diff --git a/src/tango-moenchzmq/tangods/MoenchZMQClass.h → tango-moenchzmq/src/tangods/MoenchZMQClass.h b/src/tango-moenchzmq/tangods/MoenchZMQClass.h → tango-moenchzmq/src/tangods/MoenchZMQClass.h
diff --git a/...enchzmq/tangods/MoenchZMQStateMachine.cpp → ...zmq/src/tangods/MoenchZMQStateMachine.cpp b/...enchzmq/tangods/MoenchZMQStateMachine.cpp → ...zmq/src/tangods/MoenchZMQStateMachine.cpp
diff --git a/src/tango-moenchzmq/tangods/data.hpp → tango-moenchzmq/src/tangods/data.hpp b/src/tango-moenchzmq/tangods/data.hpp → tango-moenchzmq/src/tangods/data.hpp
diff --git a/src/tango-moenchzmq/tangods/main.cpp → tango-moenchzmq/src/tangods/main.cpp b/src/tango-moenchzmq/tangods/main.cpp → tango-moenchzmq/src/tangods/main.cpp