Restructured folders and directories according to architecture

JoHeinrich · May 11, 2016 · e898530 · e898530
1 parent 4cb96c2
commit e898530
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 80 deletions.
diff --git a/src/Communication/client.cpp → src/CarCommunication/client.cpp b/src/Communication/client.cpp → src/CarCommunication/client.cpp
@@ -21,7 +21,6 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-#include "../MainHeader.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -33,7 +32,7 @@
 
 using namespace std;
 
-int main4(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
     int listenFd, portNo;
     struct sockaddr_in svrAdd;

diff --git a/src/Communication/server.cpp → src/CarCommunication/server.cpp b/src/Communication/server.cpp → src/CarCommunication/server.cpp
@@ -21,7 +21,6 @@
 // <http://www.gnu.org/licenses/>.
 //
 
-#include "../MainHeader.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -37,7 +36,7 @@ void *task1(void *);
 
 static int connFd;
 
-int main3(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
     int pId, portNo, listenFd;
     socklen_t len;

diff --git a/src/MainHeader.h b/src/MainHeader.h
diff --git a/src/MainHeader.h~ b/src/MainHeader.h~
diff --git a/src/main2.cpp → src/ObjectDetection/detectionMain.cpp b/src/main2.cpp → src/ObjectDetection/detectionMain.cpp
@@ -26,7 +26,7 @@
 using namespace std;
 //#include "imageprocessing/humandetector.h"
 
-int main2(int argc, const char* argv[]) {
+int main(int argc, const char* argv[]) {
 
     //humandetector det;
 

diff --git a/src/StreamDecoder/HDFDecoder/CMakeLists.txt b/src/StreamDecoder/HDFDecoder/CMakeLists.txt
@@ -0,0 +1,22 @@
+cmake_minimum_required (VERSION 2.8)
+project(HDFDecoder)
+set (OUTPUT_NAME HDFDecoder)
+
+
+file(GLOB_RECURSE sources "./src/*.cpp")
+file(GLOB_RECURSE headers "./src/*.h")
+
+#hdf5
+find_package (HDF5)
+if(HDF5_FOUND)
+set(LINK_LIBS ${LINK_LIBS} ${HDF5_C_STATIC_LIBRARY} ${HDF5_C_LIBRARIES})
+include_directories(${HDF5_INCLUDE_DIR})
+else(HDF5_FOUND)
+message(SEND_ERROR "HDF5 was not Found")
+endif(HDF5_FOUND)
+
+
+add_executable(${OUTPUT_NAME} ${sources} ${headers})
+target_link_libraries(${OUTPUT_NAME} ${LINK_LIBS} -lhdf5_cpp -lhdf5)
+
+
diff --git a/src/messaging/HDFFileReaderExample.cpp → ...coder/HDFDecoder/HDFFileReaderExample.cpp b/src/messaging/HDFFileReaderExample.cpp → ...coder/HDFDecoder/HDFFileReaderExample.cpp
diff --git a/src/StreamDecoder/ProtobufDeserializer/CMakeLists.txt b/src/StreamDecoder/ProtobufDeserializer/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required (VERSION 2.8)
+project(ProtobufDecoder)
+set (OUTPUT_NAME ProtobufDecoder)
+
+add_subdirectory(protofiles)
+
+
+file(GLOB_RECURSE sources "./src/*.cpp")
+file(GLOB_RECURSE headers "./src/*.h")
+
+
+add_executable(${OUTPUT_NAME} ${sources} ${headers})
+target_link_libraries(${OUTPUT_NAME} proto ${PROTOBUF_LIBRARY})
+
diff --git a/src/messaging/msg_cameraimage_reader.cpp → ...ufDeserializer/msg_cameraimage_reader.cpp b/src/messaging/msg_cameraimage_reader.cpp → ...ufDeserializer/msg_cameraimage_reader.cpp
diff --git a/src/messaging/msg_cameraimage_reader.h → ...obufDeserializer/msg_cameraimage_reader.h b/src/messaging/msg_cameraimage_reader.h → ...obufDeserializer/msg_cameraimage_reader.h
@@ -26,7 +26,7 @@
 #ifndef __protobuf_demo__msg_cameraimage_reader__
 #define __protobuf_demo__msg_cameraimage_reader__
 
-#include "../../protofiles/MsgCameraImage.pb.h"
+#include "protofiles/MsgCameraImage.pb.h"
 
 class MsgCameraImageReader{
 public:

diff --git a/src/main1.cpp → ...der/ProtobufDeserializer/protobufMain.cpp b/src/main1.cpp → ...der/ProtobufDeserializer/protobufMain.cpp
diff --git a/protofiles/CMakeLists.txt → ...bufDeserializer/protofiles/CMakeLists.txt b/protofiles/CMakeLists.txt → ...bufDeserializer/protofiles/CMakeLists.txt
diff --git a/protofiles/MsgCameraImage.pb.cc → ...erializer/protofiles/MsgCameraImage.pb.cc b/protofiles/MsgCameraImage.pb.cc → ...erializer/protofiles/MsgCameraImage.pb.cc
diff --git a/protofiles/MsgCameraImage.pb.h → ...serializer/protofiles/MsgCameraImage.pb.h b/protofiles/MsgCameraImage.pb.h → ...serializer/protofiles/MsgCameraImage.pb.h
diff --git a/protofiles/MsgCameraImage.proto → ...erializer/protofiles/MsgCameraImage.proto b/protofiles/MsgCameraImage.proto → ...erializer/protofiles/MsgCameraImage.proto
diff --git a/protofiles/header.pb.cc → ...tobufDeserializer/protofiles/header.pb.cc b/protofiles/header.pb.cc → ...tobufDeserializer/protofiles/header.pb.cc
diff --git a/protofiles/header.pb.h → ...otobufDeserializer/protofiles/header.pb.h b/protofiles/header.pb.h → ...otobufDeserializer/protofiles/header.pb.h
diff --git a/protofiles/header.proto → ...tobufDeserializer/protofiles/header.proto b/protofiles/header.proto → ...tobufDeserializer/protofiles/header.proto
diff --git a/src/main.cpp b/src/main.cpp
diff --git a/src/main.cpp~ b/src/main.cpp~