Merge branch 'tom/zmq'

1 files changed, 26 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38b1723b..43a61e4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,20 @@ 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")
+else ()
+  message(STATUS "ZMQ not found.")
+endif ()
+
 pkg_search_module(GTK gtk+-3.0)
 if (NOT GTK_FOUND)
 
@@ -102,6 +116,8 @@ 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})
 
@@ -259,11 +275,21 @@ 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 )
+  list(APPEND INDEXAMAJIG_SOURCES src/im-zmq.c)
+endif ()
+
 add_executable(indexamajig ${INDEXAMAJIG_SOURCES})
 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})
+endif ()
+
+
 # ----------------------------------------------------------------------
 # get_hkl