detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

combined all the funcs into one, servers need to be recompiled

Browse Source
This commit is contained in:
maliakal_d
2018-10-11 13:57:47 +02:00
parent b82fca2c8e
commit c24a9b223c
16 changed files with 146 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/CMakeLists.txt
View File

@ -41,7 +41,7 @@ set(PUBLICHEADERS
../slsSupportLib/include/sls_detector_funcs.h
../slsSupportLib/include/error_defs.h
../slsSupportLib/include/versionAPI.h
../slsSupportLib/include/sls_receiver_exceptions.h
../slsSupportLib/include/sls_detector_exceptions.h
../slsSupportLib/include/utilties.h
../slsSupportLib/include/container_utils.h
sharedMemory/SharedMemory.h

2
slsDetectorSoftware/Makefile
View File

@ -17,7 +17,7 @@ LIBZMQDIR = ../slsSupportLib/include
LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
SRC_CLNT= slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp ../slsSupportLib/include/ReceiverInterface.cpp slsDetector/slsDetectorUsers.cpp sharedMemory/SharedMemory.cpp ../slsSupportLib/include/utilities.cpp
DEPSINCLUDES = ../slsSupportLib/include/sls_receiver_funcs.h ../slsSupportLib/include/ansi.h ../slsSupportLib/include/sls_detector_defs.h ../slsSupportLib/include/sls_detector_funcs.h ../slsSupportLib/include/error_defs.h slsDetector/detectorData.h sharedMemory/SharedMemory.h ../slsSupportLib/include/sls_receiver_exceptions.h ../slsSupportLib/include/versionAPI.h ../slsSupportLib/include/utilities.h ../slsSupportLib/include/container_utils.h
DEPSINCLUDES = ../slsSupportLib/include/ansi.h ../slsSupportLib/include/sls_detector_defs.h ../slsSupportLib/include/sls_detector_funcs.h ../slsSupportLib/include/error_defs.h slsDetector/detectorData.h sharedMemory/SharedMemory.h ../slsSupportLib/include/sls_detector_exceptions.h ../slsSupportLib/include/versionAPI.h ../slsSupportLib/include/utilities.h ../slsSupportLib/include/container_utils.h

1
slsDetectorSoftware/doxy.config
View File

@ -88,7 +88,6 @@ INPUT = ../slsSupportLib/include/communication_funcs.h \
../slsSupportLib/include/genericSocket.h \
../slsSupportLib/include/logger.h \
../slsSupportLib/include/MySocketTCP.h \
../slsSupportLib/include/sls_receiver_funcs.h \
../slsSupportLib/include/utilities.h \
../slsSupportLib/include/ZmqSocket.h \
multiSlsDetector/multiSlsDetectorClient.h \

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1,7 +1,7 @@
#include "multiSlsDetector.h"
#include "SharedMemory.h"
#include "slsDetector.h"
#include "sls_receiver_exceptions.h"
#include "sls_detector_exceptions.h"
#include "ZmqSocket.h"
#include "multiSlsDetectorClient.h"
#include "multiSlsDetectorCommand.h"

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h
View File

@ -4,7 +4,7 @@
#include "multiSlsDetector.h"
#include "multiSlsDetectorCommand.h"
#include "sls_receiver_exceptions.h"
#include "sls_detector_exceptions.h"
#include <stdlib.h>

2
slsDetectorSoftware/sharedMemory/SharedMemory.cpp
View File

@ -1,5 +1,5 @@
#include "SharedMemory.h"
#include "sls_receiver_exceptions.h"
#include "sls_detector_exceptions.h"
#include "ansi.h"
#include <iostream>

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1,6 +1,6 @@
#include "slsDetector.h"
#include "multiSlsDetector.h"
#include "sls_receiver_exceptions.h"
#include "sls_detector_exceptions.h"
#include "SharedMemory.h"
#include "ClientInterface.h"
#include "gitInfoLib.h"