export and include

slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp

@@ -1,5 +1,5 @@
 #include "SlsQt2DPlot.h"
-#include "ansi.h"
+// #include "ansi.h"
 
 #include <qlist.h>
 #include <qprinter.h>

slsDetectorSoftware/CMakeLists.txt

@@ -32,11 +32,12 @@ target_link_libraries(slsDetectorShared PUBLIC
     slsProjectOptions
     slsProjectWarnings
     slsSupportLib
-    ${ZeroMQ_LIBRARIES}
+    zmq
     pthread
     rt
 )
 
+
 set(PUBLICHEADERS
     include/slsDetectorUsers.h
     include/detectorData.h
@@ -69,7 +70,7 @@ foreach(val RANGE ${len2})
     target_link_libraries(${val1} 
         slsDetectorShared
         pthread
-        ${ZeroMQ_LIBRARIES}
+        zmq
         rt
     )
     set_target_properties(${val1} PROPERTIES 

slsDetectorSoftware/src/SharedMemory.h

@@ -8,7 +8,6 @@
  *@short functions basic implemenation of shared memory
  */
 
-#include "ansi.h"
 #include "logger.h"
 #include "sls_detector_exceptions.h"
 
@@ -18,7 +17,7 @@
 #include <fcntl.h> // O_CREAT, O_TRUNC..
 #include <iostream>
 #include <sstream>
-#include <stdio.h>    // printf
+// #include <stdio.h>    // printf
 #include <sys/mman.h> // shared memory
 #include <sys/stat.h> // fstat
 #include <unistd.h>

slsReceiverSoftware/src/BinaryFileStatic.h

@@ -9,7 +9,6 @@
  */
 
 
-#include "ansi.h"
 #include "logger.h"
 
 #include <string>

slsSupportLib/CMakeLists.txt

@@ -43,21 +43,28 @@ if(result)
 endif()
 
 target_include_directories(slsSupportLib PUBLIC
-    ${ZeroMQ_INCLUDE_DIRS}
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 )
 
+target_include_directories(slsSupportLib PRIVATE
+    ${ZeroMQ_INCLUDE_DIRS}
+)
+
+
 set_target_properties(slsSupportLib PROPERTIES
     LIBRARY_OUTPUT_NAME SlsSupport
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
     PUBLIC_HEADER "${PUBLICHEADERS}"
 )
 
+message(${ZeroMQ_LIBRARIES})
+
 target_link_libraries(slsSupportLib 
     slsProjectOptions 
     slsProjectWarnings 
-    ${ZeroMQ_LIBRARIES}
+    # ${ZeroMQ_LIBRARIES}
+    zmq
     rapidjson)
 
 if (SLS_USE_TESTS)

slsSupportLib/include/ZmqSocket.h

@@ -7,7 +7,7 @@
  *@short functions to open/close zmq sockets
  */
 
-#include "ansi.h"
+
 #include "sls_detector_exceptions.h"
 
 #include <arpa/inet.h>			//inet_ntoa
@@ -19,9 +19,8 @@
 #include <unistd.h> 			//usleep in some machines
 #include <vector>
 #include <zmq.h>
+
 using namespace rapidjson;
-
-
 #define MAX_STR_LENGTH 1000
 
 // #define ZMQ_DETAIL

slsSupportLib/include/sls_detector_defs.h

@@ -14,8 +14,6 @@
 #define __cplusplus
 #endif
 
-#include "ansi.h"
-
 #ifdef __cplusplus
 //C++ includes
 #include "sls_detector_exceptions.h"