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

pedestal and data structures moved from 2D to 1D array; fixed bug with the file pointer in the zmq process

Browse Source
This commit is contained in:
bergamaschi
2020-06-16 13:52:36 +02:00
parent 1d9341f031
commit 2afa620a97
10 changed files with 149 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsReceiverSoftware/CMakeLists.txt
View File

@ -41,12 +41,12 @@ include_directories(
include
)
add_library(zmq STATIC IMPORTED GLOBAL)
#add_library(zmq STATIC IMPORTED GLOBAL)
set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a)
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
)
#set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a)
#set_target_properties(zmq PROPERTIES
# IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
#)
add_library(slsReceiverStatic STATIC
${SOURCES}
@ -88,7 +88,7 @@ set_target_properties(slsReceiver PROPERTIES
target_link_libraries(slsReceiver
slsReceiverShared
pthread
zmq
# zmq
rt
)
@ -105,5 +105,7 @@ install(TARGETS slsReceiverShared slsReceiverStatic slsReceiver
PUBLIC_HEADER DESTINATION include)
install(FILES ${ZMQ_STATIC_ARCHIVE}
DESTINATION lib)
#install(FILES ${ZMQ_STATIC_ARCHIVE}
#DESTINATION lib)
install(FILES
DESTINATION lib)

1
slsReceiverSoftware/Makefile
View File

@ -62,6 +62,7 @@ else
$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) $(LDFLAGRXR) -pthread $(FLAGS) $(LIBZMQ) -lrt
endif
versioning:
$(call colorecho,`./updateGitVersion.sh`)