pistache: built via cmake

This commit is contained in:
2024-05-14 20:36:50 +02:00
parent d2c5b9c038
commit f27126fa1f
4 changed files with 11 additions and 7 deletions

3
.gitmodules vendored
View File

@@ -11,6 +11,3 @@
[submodule "compression/bitshuffle_hperf"]
path = compression/bitshuffle_hperf
url = https://github.com/kalcutter/bitshuffle
[submodule "broker/pistache"]
path = broker/pistache
url = https://github.com/fleon-psi/pistache

View File

@@ -39,13 +39,22 @@ FIND_LIBRARY(NUMA_LIBRARY NAMES numa DOC "NUMA Library")
CHECK_INCLUDE_FILE(numaif.h HAS_NUMAIF)
CHECK_INCLUDE_FILE(numa.h HAS_NUMA_H)
include(FetchContent)
FetchContent_Declare(
pistache_http
GIT_REPOSITORY https://github.com/fleon-psi/pistache
GIT_TAG 51553b92cc7bb25ac792462722ddd4fae33d14b1
)
FetchContent_MakeAvailable(pistache_http)
ADD_SUBDIRECTORY(jungfrau)
ADD_SUBDIRECTORY(compression)
ADD_SUBDIRECTORY(common)
ADD_SUBDIRECTORY(writer)
ADD_SUBDIRECTORY(frame_serialize)
ADD_SUBDIRECTORY(broker/pistache)
ADD_SUBDIRECTORY(detector_control)
IF (JFJOCH_WRITER_ONLY)
MESSAGE(STATUS "Compiling HDF5 writer only")

View File

@@ -1,4 +1,5 @@
AUX_SOURCE_DIRECTORY(gen/model MODEL_SOURCES)
ADD_LIBRARY(JFJochAPI STATIC ${MODEL_SOURCES} gen/api/DefaultApi.cpp gen/api/DefaultApi.h)
TARGET_LINK_LIBRARIES(JFJochAPI pistache_static)
@@ -15,5 +16,3 @@ ADD_EXECUTABLE(jfjoch_broker jfjoch_broker.cpp)
TARGET_LINK_LIBRARIES(jfjoch_broker JFJochBroker)
INSTALL(TARGETS jfjoch_broker RUNTIME)

Submodule broker/pistache deleted from 51553b92cc