detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-10-15 12:00:38 +02:00
Code Issues Actions Packages Releases Activity

Revert "removed option sls_use_server from cmake"
Build on RHEL9 docker image / build (push) Successful in 3m57s
Details
Build on RHEL8 docker image / build (push) Successful in 5m9s
Details
Build and Deploy on local RHEL9 / build (push) Successful in 2m5s
Details
Build and Deploy on local RHEL8 / build (push) Successful in 5m5s
Details
Run Simulator Tests on local RHEL9 / build (push) Successful in 20m42s
Details
Run Simulator Tests on local RHEL8 / build (push) Successful in 24m9s
Details

Browse Source 
This reverts commit 0e82aed80d.
This commit is contained in:
mazzol_a
2026-10-06 12:14:06 +02:00
parent 0e82aed80d
commit d18a8bf64f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8 -2
View File
@@ -219,6 +219,7 @@ option(SLS_BUILD_SHARED_LIBRARIES "Build shared libaries" OFF)
option(SLS_USE_TEXTCLIENT "Text Client" ON)
option(SLS_USE_DETECTOR "Detector libs" ON)
option(SLS_USE_RECEIVER "Receiver" ON)
option(SLS_USE_SERVER "Server" ON)
option(SLS_USE_RECEIVER_BINARIES "Receiver binaries" ON)
option(SLS_USE_GUI "GUI" OFF)
option(SLS_USE_SIMULATOR "Simulator" OFF)
@@ -257,6 +258,7 @@ if(SLS_BUILD_ONLY_MATTERHORN)
set(SLS_USE_DETECTOR ON CACHE BOOL "Disabled for MATTERHORN_ONLY" FORCE)
set(SLS_USE_RECEIVER OFF CACHE BOOL "Disabled for MATTERHORN_ONLY" FORCE)
set(SLS_USE_RECEIVER_BINARIES OFF CACHE BOOL "Disabled for MATTERHORN_ONLY" FORCE)
set(SLS_USE_SERVER ON CACHE BOOL "Enable building cpp server" FORCE)
set(SLS_USE_MATTERHORN ON CACHE BOOL "Enable Matterhorn" FORCE)
endif()
@@ -436,6 +438,11 @@ if (SLS_USE_DETECTOR OR SLS_USE_TEXTCLIENT)
add_subdirectory(slsDetectorSoftware)
endif()
# TODO refactor with simulators
if (SLS_USE_SERVER)
add_subdirectory(slsDetectorServers/slsDetectorServer_cpp)
endif()
if (SLS_USE_RECEIVER)
add_subdirectory(slsReceiverSoftware)
endif (SLS_USE_RECEIVER)
@@ -450,8 +457,7 @@ if (SLS_USE_SIMULATOR)
endif (SLS_USE_SIMULATOR)
# cant add_subdirectory twice
if (SLS_USE_MATTERHORN AND NOT SLS_USE_SIMULATOR)
add_subdirectory(slsDetectorServers/slsDetectorServer_cpp)
if (SLS_USE_MATTERHORN AND !SLS_USE_SIMULATOR)
add_subdirectory(slsDetectorServers/matterhornServer)
endif()
slsDetectorServers/CMakeLists.txt
-2
View File
@@ -8,8 +8,6 @@ install(TARGETS slsProjectCSettings
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
add_subdirectory(slsDetectorServer_cpp)
add_subdirectory(ctbDetectorServer)
add_subdirectory(xilinx_ctbDetectorServer)
add_subdirectory(eigerDetectorServer)