mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-05-02 19:00:05 +02:00
2f2fe4dd47
* Setting pattern from memory (#218) * ToString accepts c-style arrays * fixed patwait time bug in validation * Introduced pattern class * compile for servers too * Python binding for Pattern * added scanParameters in Python * slsReceiver: avoid potential memory leak around Implementation::generalData * additional constructors for scanPrameters in python * bugfix: avoid potentital memory leak in receiver if called outside constructor context * added scanParameters in Python * additional constructors for scanPrameters in python * M3defaultpattern (#227) * default pattern for m3 and moench including Python bindings * M3settings (#228) * some changes to compile on RH7 and in the server to load the default chip status register at startup * Updated mythen3DeectorServer_developer executable with correct initialization at startup Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com> Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch> * Pattern.h as a public header files (#229) * fixed buffer overflow but caused by using global instead of local enum * replacing out of range trimbits with edge values * replacing dac values that are out of range after interpolation * updated pybind11 to 2.6.2 * Mythen3 improved synchronization (#231) Disabling scans for multi module Mythen3, since there is no feedback of the detectors being ready startDetector first starts the slaves then the master acquire firs calls startDetector for the slaves then acquire on the master getMaster to read back from hardware which one is master * New server for JF to go with the new FW (#232) * Modified Jungfrau speed settings for HW1.0 - FW fix version 1.1.1, compilation date 210218 * Corrected bug. DBIT clk phase is implemented in both HW version 1.0 and 2.0. Previous version did not update the DBIT phase shift on the configuration of a speed. * fix for m3 scan with single module * m3 fw version * m3 server * bugfix for bottom when setting quad * new strategy for finding zmq based on cppzmq Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch> Co-authored-by: Dhanya Thattil <33750417+thattil@users.noreply.github.com> Co-authored-by: Alejandro Homs Puron <ahoms@esrf.fr> Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch> Co-authored-by: Xiaoqiang Wang <xiaoqiangwang@gmail.com> Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>
108 lines
3.1 KiB
CMake
Executable File
108 lines
3.1 KiB
CMake
Executable File
set(SOURCES
|
|
src/string_utils.cpp
|
|
src/file_utils.cpp
|
|
src/ClientSocket.cpp
|
|
src/DataSocket.cpp
|
|
src/ServerSocket.cpp
|
|
src/ServerInterface.cpp
|
|
src/ToString.cpp
|
|
src/network_utils.cpp
|
|
src/ZmqSocket.cpp
|
|
src/UdpRxSocket.cpp
|
|
src/sls_detector_exceptions.cpp
|
|
)
|
|
|
|
# Header files to install as a part of the library
|
|
set(PUBLICHEADERS
|
|
include/sls/sls_detector_defs.h
|
|
include/sls/sls_detector_exceptions.h
|
|
include/sls/container_utils.h
|
|
include/sls/string_utils.h
|
|
include/sls/network_utils.h
|
|
include/sls/ToString.h
|
|
include/sls/TypeTraits.h
|
|
include/sls/TimeHelper.h
|
|
)
|
|
|
|
# Additional headers to be installed if SLS_DEVEL_HEADERS
|
|
# is specified as an option. Aim is to give the developer
|
|
# access to utilities in the support library while
|
|
# at the same time offer a minimal install
|
|
if(SLS_DEVEL_HEADERS)
|
|
set(PUBLICHEADERS
|
|
${PUBLICHEADERS}
|
|
include/sls/file_utils.h
|
|
include/sls/sls_detector_funcs.h
|
|
include/sls/ClientSocket.h
|
|
include/sls/DataSocket.h
|
|
include/sls/ServerSocket.h
|
|
include/sls/ServerInterface.h
|
|
include/sls/Timer.h
|
|
include/sls/StaticVector.h
|
|
include/sls/UdpRxSocket.h
|
|
include/sls/versionAPI.h
|
|
include/sls/ZmqSocket.h
|
|
include/sls/bit_utils.h
|
|
)
|
|
endif()
|
|
|
|
# Create an object library to avoid building the library twice
|
|
add_library(slsSupportObject OBJECT
|
|
${SOURCES}
|
|
${HEADERS}
|
|
)
|
|
|
|
target_include_directories(slsSupportObject
|
|
PUBLIC
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
|
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
|
|
)
|
|
|
|
target_link_libraries(slsSupportObject
|
|
PUBLIC
|
|
slsProjectOptions
|
|
libzmq
|
|
rapidjson
|
|
PRIVATE
|
|
slsProjectWarnings
|
|
)
|
|
|
|
if (SLS_USE_TESTS)
|
|
add_subdirectory(tests)
|
|
endif(SLS_USE_TESTS)
|
|
|
|
# Add shared library version of the support lib
|
|
add_library(slsSupportShared SHARED $<TARGET_OBJECTS:slsSupportObject>)
|
|
target_link_libraries(slsSupportShared PUBLIC slsSupportObject)
|
|
|
|
set_target_properties(slsSupportShared PROPERTIES
|
|
LIBRARY_OUTPUT_NAME SlsSupport
|
|
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
|
|
PUBLIC_HEADER "${PUBLICHEADERS}"
|
|
)
|
|
|
|
# Add static version of the support lib
|
|
add_library(slsSupportStatic STATIC $<TARGET_OBJECTS:slsSupportObject>)
|
|
target_link_libraries(slsSupportStatic PUBLIC slsSupportObject)
|
|
|
|
set_target_properties(slsSupportStatic PROPERTIES
|
|
ARCHIVE_OUTPUT_NAME SlsSupportStatic
|
|
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
|
|
PUBLIC_HEADER "${PUBLICHEADERS}"
|
|
)
|
|
|
|
if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
|
|
set_property(TARGET slsSupportObject PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
|
set_property(TARGET slsSupportShared PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
|
set_property(TARGET slsSupportStatic PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
|
endif()
|
|
|
|
install(TARGETS slsSupportShared slsSupportStatic slsSupportObject
|
|
EXPORT "${TARGETS_EXPORT_NAME}"
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls
|
|
)
|
|
|
|
|