diff options
| author | Thomas White <taw@physics.org> | 2021-04-15 15:30:25 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-04-15 16:43:40 +0200 |
| commit | afcb7b568947c20fb3477a178be5aefe3203b603 (patch) | |
| tree | 25d3d8a475bd4353083ce00f893e766525e1e625 /CMakeLists.txt | |
| parent | 0dcd6c7e2fbfe78e4d2f26e01de0d4ea032d8fd6 (diff) | |
Separate ZMQ from MessagePack, switch to pub/sub socket
Indexamajig uses only ZMQ, to receive streaming data, while libcrystfel
uses only msgpack to implement another type of image format.
The two of these are eventually tied together in process_image, which
does this: if ( have_zmq_data ) interpret_zmq_data_as_msgpack;
- however, they would be easy to split up if we wanted to do something
else (CBF data over ZMQ, anyone?).
This commit also switches the ZMQ connector to use a pub/sub socket
instead of a request/reply one. This matches changes in OnDA.
At the moment, the MessagePack image reader simply dumps the object to
disk.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cfaab14..62637a78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,13 +31,6 @@ link_directories (${GLIB_LIBRARY_DIRS}) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") -pkg_search_module(MSGPACK msgpack) -if (MSGPACK_FOUND) - message(STATUS "Found Messagepack") -else () - message(STATUS "MessagePack not found.") -endif () - pkg_search_module(ZMQ libzmq) if (ZMQ_FOUND) message(STATUS "Found ZMQ") @@ -117,7 +110,6 @@ set(HAVE_GTK ${GTK_FOUND}) set(HAVE_OPENCL ${OpenCL_FOUND}) set(HAVE_GDKPIXBUF ${GDKPIXBUF_FOUND}) set(HAVE_GDK ${GDK_FOUND}) -set(HAVE_MSGPACK ${MSGPACK_FOUND}) set(HAVE_ZMQ ${ZMQ_FOUND}) set(PACKAGE_VERSION ${PROJECT_VERSION}) @@ -255,7 +247,7 @@ list(APPEND CRYSTFEL_EXECUTABLES list_events) set(INDEXAMAJIG_SOURCES src/indexamajig.c src/im-sandbox.c src/process_image.c src/time-accounts.c) -if ( ZMQ_FOUND AND MSGPACK_FOUND ) +if ( ZMQ_FOUND ) list(APPEND INDEXAMAJIG_SOURCES src/im-zmq.c) endif () @@ -265,9 +257,9 @@ target_include_directories(indexamajig PRIVATE ${COMMON_INCLUDES}) target_link_libraries(indexamajig ${COMMON_LIBRARIES}) list(APPEND CRYSTFEL_EXECUTABLES indexamajig) -if ( ZMQ_FOUND AND MSGPACK_FOUND ) - target_include_directories(indexamajig PRIVATE ${ZMQ_INCLUDE_DIR} ${MSGPACK_INCLUDE_DIR}) - target_link_libraries(indexamajig ${ZMQ_LIBRARIES} ${MSGPACK_LIBRARIES}) +if ( ZMQ_FOUND ) + target_include_directories(indexamajig PRIVATE ${ZMQ_INCLUDE_DIR}) + target_link_libraries(indexamajig ${ZMQ_LIBRARIES}) endif () |