detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-29 01:20:02 +02:00
Code Issues Actions Packages Releases Activity

export and include

Browse Source
This commit is contained in:
Erik Frojdh 2020-03-18 10:20:01 +01:00
parent ec9f8305e9
commit e7e201bd2a
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp
View File

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

5
slsDetectorSoftware/CMakeLists.txt
View File

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

3
slsDetectorSoftware/src/SharedMemory.h
View File

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

1
slsReceiverSoftware/src/BinaryFileStatic.h
View File

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

11
slsSupportLib/CMakeLists.txt
View File

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

5
slsSupportLib/include/ZmqSocket.h
View File

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

2
slsSupportLib/include/sls_detector_defs.h
View File

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