From 0f93dfbeffa22275a7580c29f92f73fdd064829e Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Tue, 9 Dec 2025 11:50:01 +0100
Subject: [PATCH] CMake: Make jfjoch_broker code bit more independent from
 pistache

---
 broker/CMakeLists.txt         | 23 +++++++++++++----------
 broker/JFJochStateMachine.cpp |  1 -
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/broker/CMakeLists.txt b/broker/CMakeLists.txt
index fb07b86d..f8daa7de 100644
--- a/broker/CMakeLists.txt
+++ b/broker/CMakeLists.txt
@@ -1,22 +1,25 @@
+# OpenAPI definition
+INSTALL(FILES redoc-static.html DESTINATION jfjoch/frontend COMPONENT jfjoch )
+
+# OpenAPI model
 AUX_SOURCE_DIRECTORY(gen/model MODEL_SOURCES)
+ADD_LIBRARY(JFJochAPI STATIC ${MODEL_SOURCES})
+TARGET_INCLUDE_DIRECTORIES(JFJochAPI PUBLIC gen/model)
 
-ADD_LIBRARY(JFJochAPI STATIC ${MODEL_SOURCES} gen/api/DefaultApi.cpp gen/api/DefaultApi.h)
-
-TARGET_LINK_LIBRARIES(JFJochAPI pistache_static ${CMAKE_DL_LIBS})
-TARGET_INCLUDE_DIRECTORIES(JFJochAPI PUBLIC gen/model gen/api)
-
+# Jungfraujoch Broker (abstract from HTTP service)
 ADD_LIBRARY(JFJochBroker STATIC
         JFJochStateMachine.cpp JFJochStateMachine.h
         JFJochServices.cpp JFJochServices.h
-        JFJochBrokerHttp.cpp JFJochBrokerHttp.h JFJochBrokerParser.cpp JFJochBrokerParser.h
-        OpenAPIConvert.h
-        OpenAPIConvert.cpp)
+        JFJochBrokerParser.cpp JFJochBrokerParser.h
+        OpenAPIConvert.h OpenAPIConvert.cpp)
 
 TARGET_LINK_LIBRARIES(JFJochBroker JFJochReceiver JFJochDetector JFJochCommon JFJochAPI JFJochPreview)
 
 ADD_EXECUTABLE(jfjoch_broker jfjoch_broker.cpp)
 TARGET_LINK_LIBRARIES(jfjoch_broker JFJochBroker)
 
+ADD_EXECUTABLE(jfjoch_broker jfjoch_broker.cpp JFJochBrokerHttp.cpp JFJochBrokerHttp.h
+        gen/api/DefaultApi.cpp gen/api/DefaultApi.h)
+TARGET_LINK_LIBRARIES(jfjoch_broker JFJochBroker pistache_static ${CMAKE_DL_LIBS})
+TARGET_INCLUDE_DIRECTORIES(jfjoch_broker PUBLIC gen/api)
 INSTALL(TARGETS jfjoch_broker RUNTIME COMPONENT jfjoch)
-
-INSTALL(FILES redoc-static.html DESTINATION jfjoch/frontend COMPONENT jfjoch )
diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp
index 3d451aa6..9d517dd1 100644
--- a/broker/JFJochStateMachine.cpp
+++ b/broker/JFJochStateMachine.cpp
@@ -5,7 +5,6 @@
 
 #include "JFJochStateMachine.h"
 #include "../preview/JFJochTIFF.h"
-#include "pistache/net.h"
 #include "../common/CUDAWrapper.h"
 
 JFJochStateMachine::JFJochStateMachine(const DiffractionExperiment& in_experiment,