From 8627caed11c4961728431be74d60510b50986b1b Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Mon, 21 Sep 2020 11:04:14 +0200
Subject: [PATCH] Fix buffer writer build files

---
 sf-buffer-writer/CMakeLists.txt      | 30 ++++++++++------------------
 sf-buffer-writer/test/CMakeLists.txt |  9 +++------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/sf-buffer-writer/CMakeLists.txt b/sf-buffer-writer/CMakeLists.txt
index f2763dc..636556d 100644
--- a/sf-buffer-writer/CMakeLists.txt
+++ b/sf-buffer-writer/CMakeLists.txt
@@ -1,26 +1,18 @@
-
-find_package(MPI REQUIRED)
-# Because of openmpi.
-add_definitions(-DOMPI_SKIP_MPICXX)
-
 file(GLOB SOURCES
         src/*.cpp)
 
-add_library(jf-live-daq-lib STATIC ${SOURCES})
-target_include_directories(jf-live-daq-lib
-        PUBLIC include/
-        SYSTEM ${MPI_INCLUDE_PATH})
-
-target_link_libraries(jf-live-daq-lib
+add_library(sf-buffer-writer-lib STATIC ${SOURCES})
+target_include_directories(sf-buffer-writer-lib PUBLIC include/)
+target_link_libraries(sf-buffer-writer-lib
         external
-        core-buffer-lib
-        ${MPI_LIBRARIES})
+        core-buffer-lib)
 
-add_executable(jf-live-daq src/main.cpp)
-set_target_properties(jf-live-daq PROPERTIES OUTPUT_NAME jf_live_daq)
-target_link_libraries(jf-live-daq
-        jf-live-daq-lib
-        )
+add_executable(sf-buffer-writer src/main.cpp)
+set_target_properties(sf-buffer-writer PROPERTIES OUTPUT_NAME sf_buffer)
+target_link_libraries(sf-buffer-writer
+        sf-buffer-writer-lib
+        zmq
+        rt)
 
 enable_testing()
-add_subdirectory(test/)
\ No newline at end of file
+add_subdirectory(test/)
diff --git a/sf-buffer-writer/test/CMakeLists.txt b/sf-buffer-writer/test/CMakeLists.txt
index 7dc93bb..7d1417c 100644
--- a/sf-buffer-writer/test/CMakeLists.txt
+++ b/sf-buffer-writer/test/CMakeLists.txt
@@ -1,10 +1,7 @@
-add_executable(jf-live-daq-tests main.cpp)
+add_executable(sf-buffer-writer-tests main.cpp)
 
-target_link_libraries(jf-live-daq-tests
-        jf-live-daq-lib
-        hdf5
-        hdf5_hl
-        hdf5_cpp
+target_link_libraries(sf-buffer-writer-tests
+        sf-buffer-writer-lib
         zmq
         gtest
         )