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

moved all the common header files from receiverSoftware to commonFiles

Browse Source
This commit is contained in:
maliakal_d
2018-10-02 16:32:37 +02:00
parent 757bc89d05
commit 100c1b81f8
56 changed files with 50 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/CMakeLists.txt
View File

@ -25,8 +25,6 @@ slsDetectorCommand
slsDetectorAnalysis
slsReceiverInterface
threadFiles
../slsReceiverSoftware/include
../slsReceiverSoftware/MySocketTCP
)
add_definitions(
@ -49,7 +47,7 @@ add_library(slsDetectorShared SHARED
add_library(zmq STATIC IMPORTED GLOBAL)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsReceiverSoftware/include/libzmq.a)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../commonFiles/libzmq.a)
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
)
@ -63,6 +61,7 @@ set(PUBLICHEADERS
../commonFiles/sls_detector_funcs.h
../commonFiles/error_defs.h
../commonFiles/versionAPI.h
../commonFiles/sls_receiver_exceptions.h
sharedMemory/SharedMemory.h
slsDetector/slsDetectorUtils.h
slsDetector/slsDetector.h
@ -72,7 +71,6 @@ set(PUBLICHEADERS
slsDetectorAnalysis/detectorData.h
multiSlsDetector/multiSlsDetector.h
slsReceiverInterface/receiverInterface.h
../slsReceiverSoftware/include/sls_receiver_exceptions.h
)
set_target_properties(slsDetectorShared PROPERTIES
LIBRARY_OUTPUT_NAME SlsDetector

4
slsDetectorSoftware/Makefile
View File

@ -13,11 +13,11 @@ INCLUDES?= -I../commonFiles -IslsDetector -I../slsReceiverSoftware/MySocketTCP
#EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom
LIBZMQDIR = ../slsReceiverSoftware/include
LIBZMQDIR = ../commonFiles
LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
SRC_CLNT= slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp threadFiles/CondVar.cpp threadFiles/Mutex.cpp threadFiles/ThreadPool.cpp sharedMemory/SharedMemory.cpp #../slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp
DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h ../commonFiles/sls_detector_defs.h ../commonFiles/sls_detector_funcs.h ../commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/detectorData.h threadFiles/Global.h threadFiles/Task.h sharedMemory/SharedMemory.h $(LIBZMQDIR)/sls_receiver_exceptions.h ../commonFiles/versionAPI.h
DEPSINCLUDES = ../commonFiles/sls_receiver_defs.h ../commonFiles/sls_receiver_funcs.h ../commonFiles/ansi.h ../commonFiles/sls_detector_defs.h ../commonFiles/sls_detector_funcs.h ../commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/detectorData.h threadFiles/Global.h threadFiles/Task.h sharedMemory/SharedMemory.h ../commonFiles/sls_receiver_exceptions.h ../commonFiles/versionAPI.h

23
slsDetectorSoftware/doxy.config
View File

@ -80,10 +80,18 @@ LATEX_HIDE_INDICES = YES
PREDEFINED = __cplusplus
INPUT = ../commonfiles/communication_funcs.h \
INPUT = ../commonfiles/communication_funcs.h \
../commonfiles/error_defs.h \
../commonfiles/sls_detector_defs.h \
../commonfiles/sls_detector_defs.h \
../commonfiles/sls_detector_funcs.h \
../commonfiles/ansi.h \
../commonfiles/include/genericSocket.h \
../commonfiles/include/logger.h \
../commonfiles/include/MySocketTCP.h \
../commonfiles/include/sls_receiver_defs.h \
../commonfiles/include/sls_receiver_funcs.h \
../commonfiles/include/utilities.h \
../commonfiles/include/ZmqSocket.h \
multiSlsDetector/multiSlsDetectorClient.h \
multiSlsDetector/multiSlsDetectorCommand.h \
multiSlsDetector/multiSlsDetector.h \
@ -102,7 +110,6 @@ INPUT = ../commonfiles/communication_funcs.h \
threadFiles/Single.h \
threadFiles/Task.h \
threadFiles/ThreadPool.h \
../slsReceiverSoftware/include/ansi.h \
../slsReceiverSoftware/include/BinaryFile.h \
../slsReceiverSoftware/include/BinaryFileStatic.h \
../slsReceiverSoftware/include/circularFifo.h \
@ -111,24 +118,18 @@ INPUT = ../commonfiles/communication_funcs.h \
../slsReceiverSoftware/include/Fifo.h \
../slsReceiverSoftware/include/File.h \
../slsReceiverSoftware/include/GeneralData.h \
../slsReceiverSoftware/include/genericSocket.h \
../slsReceiverSoftware/include/HDF5File.h \
../slsReceiverSoftware/include/HDF5FileStatic.h \
../slsReceiverSoftware/include/Listener.h \
../slsReceiverSoftware/include/logger.h \
../slsReceiverSoftware/include/MySocketTCP.h \
../slsReceiverSoftware/include/receiver_defs.h \
../slsReceiverSoftware/include/sls_receiver_defs.h \
../slsReceiverSoftware/include/sls_receiver_funcs.h \
../slsReceiverSoftware/include/slsReceiver.h \
../slsReceiverSoftware/include/slsReceiverTCPIPInterface.h \
../slsReceiverSoftware/include/slsReceiverUsers.h \
../slsReceiverSoftware/include/ThreadObject.h \
../slsReceiverSoftware/include/UDPBaseImplementation.h \
../slsReceiverSoftware/include/UDPInterface.h \
../slsReceiverSoftware/include/UDPStandardImplementation.h \
../slsReceiverSoftware/include/utilities.h \
../slsReceiverSoftware/include/ZmqSocket.h
../slsReceiverSoftware/include/UDPStandardImplementation.h