From d18a8bf64f2fe296f58f9a1297fe8a1eb9ce528f Mon Sep 17 00:00:00 2001 From: Alice Date: Tue, 6 Oct 2026 12:14:06 +0200 Subject: [PATCH] Revert "removed option sls_use_server from cmake" This reverts commit 0e82aed80de72d545fc79e3eecbc43d33c8eb0a8. --- CMakeLists.txt | 10 ++++++++-- slsDetectorServers/CMakeLists.txt | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ce785e31..5ea532cee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/slsDetectorServers/CMakeLists.txt b/slsDetectorServers/CMakeLists.txt index acf15467d..3a04f2bf9 100644 --- a/slsDetectorServers/CMakeLists.txt +++ b/slsDetectorServers/CMakeLists.txt @@ -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)