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

client moved everythign from common files to slsSupportLin/include

Browse Source
This commit is contained in:
maliakal_d
2018-10-08 10:45:56 +02:00
parent 70f55ff788
commit f7a6938366
73 changed files with 51 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsReceiverSoftware/CMakeLists.txt
View File

@ -13,7 +13,7 @@ set(SOURCES
src/DataProcessor.cpp
src/DataStreamer.cpp
src/Fifo.cpp
../commonFiles/utilities.cpp
../slsSupportLib/include/utilities.cpp
)
@ -39,12 +39,12 @@ add_definitions(
include_directories(
include
../commonFiles
../slsSupportLib/include
)
add_library(zmq STATIC IMPORTED GLOBAL)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../commonFiles/libzmq.a)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsSupportLib/include/libzmq.a)
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
)
@ -64,14 +64,14 @@ add_library(slsReceiverShared SHARED
)
set(PUBLICHEADERS
../commonFiles/sls_receiver_defs.h
../commonFiles/ansi.h
../commonFiles/sls_receiver_funcs.h
../commonFiles/MySocketTCP.h
../commonFiles/genericSocket.h
../commonFiles/logger.h
../commonFiles/sls_receiver_exceptions.h
../commonFiles/utilities.h
../slsSupportLib/include/sls_receiver_defs.h
../slsSupportLib/include/ansi.h
../slsSupportLib/include/sls_receiver_funcs.h
../slsSupportLib/include/MySocketTCP.h
../slsSupportLib/include/genericSocket.h
../slsSupportLib/include/logger.h
../slsSupportLib/include/sls_receiver_exceptions.h
../slsSupportLib/include/utilities.h
)

4
slsReceiverSoftware/Makefile
View File

@ -5,7 +5,7 @@ LIBDIR ?= ../bin
DOCDIR ?= docs
SRCDIR = src
INCDIR = include
COMMONDIR = ../commonFiles
COMMONDIR = ../slsSupportLib/include
TESTDIR = test
BUILDDIR = build
PROGS = $(DESTDIR)/slsReceiver
@ -21,7 +21,7 @@ INCLUDES?= $(INCLUDESRXR) -I $(INCDIR) -I $(COMMONDIR)
##############################################################
# ZMQ specific: in this case, you need ZMQ libraries already included in this package
###########################################################
LIBZMQDIR = ../commonFiles
LIBZMQDIR = ../slsSupportLib/include
LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq