From 94ea1c4468fed5ee4be48e3334fe75541ecaba02 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 8 Jan 2019 15:44:52 +0100 Subject: ZMQ connection and setup stuff --- CMakeLists.txt | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 30b34d36..3c01b267 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) @@ -257,13 +271,23 @@ list(APPEND CRYSTFEL_EXECUTABLES list_events) # indexamajig set(INDEXAMAJIG_SOURCES src/indexamajig.c src/im-sandbox.c src/process_image.c - src/time-accounts.c src/zmq.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 -- cgit v1.2.3