CMake: Make jfjoch_broker code bit more independent from pistache
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 1m56s
Build Packages / build:rpm (rocky8_nocuda) (push) Failing after 2m1s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Failing after 1m55s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 2m4s
Build Packages / Generate python client (push) Successful in 13s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Failing after 2m3s
Build Packages / build:rpm (rocky8) (push) Failing after 2m13s
Build Packages / build:rpm (rocky8_sls9) (push) Failing after 2m16s
Build Packages / build:rpm (rocky9) (push) Failing after 2m28s
Build Packages / Build documentation (push) Successful in 36s
Build Packages / build:rpm (ubuntu2404) (push) Failing after 1m33s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Failing after 1m16s
Build Packages / Unit tests (push) Failing after 1m29s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Failing after 1m15s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Failing after 1m18s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Failing after 1m30s
Build Packages / Generate python client (pull_request) Successful in 12s
Build Packages / Create release (pull_request) Has been skipped
Build Packages / build:rpm (rocky8_sls9) (pull_request) Failing after 1m37s
Build Packages / Build documentation (pull_request) Successful in 35s
Build Packages / build:rpm (rocky8) (pull_request) Failing after 1m37s
Build Packages / build:rpm (ubuntu2204) (pull_request) Failing after 1m30s
Build Packages / build:rpm (ubuntu2404) (pull_request) Failing after 1m30s
Build Packages / Unit tests (pull_request) Failing after 1m23s
Build Packages / build:rpm (rocky9) (pull_request) Failing after 1m59s

This commit is contained in:
2025-12-09 11:50:01 +01:00
parent 5d0bae23f9
commit 0f93dfbeff
2 changed files with 13 additions and 11 deletions
+13 -10
View File
@@ -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 )
-1
View File
@@ -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,