step one project reorganization

slsReceiverSoftware/CMakeLists.txt

@@ -10,7 +10,6 @@ set(SOURCES
     src/DataProcessor.cpp
     src/DataStreamer.cpp
     src/Fifo.cpp
-    ../slsSupportLib/src/ClientInterface.cpp
 )
 
 
@@ -30,30 +29,22 @@ if (USE_HDF5)
 endif (USE_HDF5)
 
 
-#add_definitions(
-#    -DVERBOSE
-#)
-
-include_directories(
-    include
-    ../slsSupportLib/include
-)
-
+# include_directories(
+#     ${SLS_SUPPORT_LIB_INCLUDE_DIRS}
+# )
 
 add_library(slsReceiverShared SHARED
     ${SOURCES}
     ${HEADERS}
 )
 
-set(PUBLICHEADERS
-    ../slsSupportLib/include/sls_detector_defs.h
-    ../slsSupportLib/include/ansi.h
-    ../slsSupportLib/include/sls_detector_funcs.h
-    ../slsSupportLib/include/MySocketTCP.h
-    ../slsSupportLib/include/genericSocket.h
-    ../slsSupportLib/include/logger.h
-	../slsSupportLib/include/sls_detector_exceptions.h
-)
+target_link_libraries(slsReceiverShared slsSupportLib)
+target_include_directories(slsReceiverShared PUBLIC include)
+
+#What is included in slsReceiverLib?
+# set(PUBLICHEADERS
+
+# )
 
 
 set_target_properties(slsReceiverShared PROPERTIES
@@ -70,6 +61,7 @@ set_target_properties(slsReceiver PROPERTIES
 )
 
 target_link_libraries(slsReceiver
+    slsSupportLib
     slsReceiverShared
     pthread
     zmq

slsReceiverSoftware/include/slsReceiverImplementation.h

@@ -6,7 +6,7 @@
 /**
  * @short does all the functions for a receiver, set/get parameters, start/stop etc.
  */
-#include "sls_detector_defs.h"
+// #include "sls_detector_defs.h"
 #include "receiver_defs.h"
 #include "logger.h"
 #include "container_utils.h"
@@ -15,6 +15,7 @@ class Listener;
 class DataProcessor;
 class DataStreamer;
 class Fifo;
+class slsDetectorDefs;
 
 #include <exception>
 #include <vector>