Commit 0c10818b authored by Jonathan Hanks's avatar Jonathan Hanks

Extracted the simple_pv library out of the zmq_stream area.

simple_pv was written to support zmq, but is used by other streams and
does not require zmq.  This change moves it to its own area and makes
sure it is always built, even when zmq is not found.

Also removed an unneeded header from dix_xmit.c.  Its presence was
noticed when the includes changed for the simple_pv move.
parent 95d65271
......@@ -2,6 +2,7 @@ add_subdirectory(gds)
add_subdirectory(daqd)
add_subdirectory(dv)
add_subdirectory(nds)
add_subdirectory(simple_pv)
add_subdirectory(mx_stream)
add_subdirectory(run_number)
add_subdirectory(drv)
......
......@@ -3,7 +3,7 @@ add_executable(ix_test ix_test.c)
target_link_libraries(ix_test PUBLIC dolphin::sisci)
add_executable(dix_xmit dix_xmit.c)
target_link_libraries(dix_xmit PUBLIC driver::shmem dolphin::sisci zmq::simple_pv)
target_link_libraries(dix_xmit PUBLIC driver::shmem dolphin::sisci pv::simple_pv)
install(TARGETS dix_xmit DESTINATION bin)
add_executable(dix_recv dix_recv.c)
......
......@@ -23,7 +23,6 @@
#include <time.h>
#include "../include/daqmap.h"
#include "../include/daq_core.h"
#include "dc_utils.h"
#include "sisci_types.h"
#include "sisci_api.h"
......
......@@ -29,7 +29,7 @@ if (OPENMX_FOUND)
add_executable(omx_recv omx_recv.c)
target_link_libraries(omx_recv PUBLIC
driver::shmem
zmq::simple_pv
pv::simple_pv
openmx::openmx
${CMAKE_THREAD_LIBS_INIT}
)
......
......@@ -27,7 +27,7 @@
// #include "testlib.h"
#include "../zmq_stream/simple_pv.h"
#include "simple_pv.h"
#define __CDECL
......
add_library(simple_pv STATIC simple_pv.c)
target_include_directories(simple_pv PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
add_library(pv::simple_pv ALIAS simple_pv)
\ No newline at end of file
......@@ -8,10 +8,6 @@ include(Cpp11Atomic)
include(FindThreads)
find_package(ZMQ4 REQUIRED)
add_library(simple_pv STATIC simple_pv.c)
target_include_directories(simple_pv PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
add_library(zmq::simple_pv ALIAS simple_pv)
add_library(zmq_transport STATIC zmq_transport.c)
target_include_directories(zmq_transport PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include)
target_include_directories(zmq_transport PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
......@@ -29,7 +25,7 @@ target_link_libraries(zmq_recv PUBLIC
zmq_transport
driver::shmem
zmq4::zmq
zmq::simple_pv
pv::simple_pv
${CMAKE_THREAD_LIBS_INIT}
# -no-pie
)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment