Move acquisition interface to own lib

CMakeLists.txt

@@ -11,6 +11,7 @@ set(BUILD_DIR ${CMAKE_BINARY_DIR}/CMakeExternals/Build)
 set(INSTALL_DIR ${CMAKE_BINARY_DIR}/CMakeExternals/Install)
 
 
+add_subdirectory(src/acquisition)
 add_subdirectory(src/ui)
 
 ExternalProject_Add( ui-wasm

src/service/acquisition/CMakeLists.txt

@@ -1,5 +1,5 @@
-add_library(od_acquisition INTERFACE acqWorker.hpp daq_api.hpp)
-target_include_directories(od_acquisition INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/.)
-target_link_libraries(od_acquisition INTERFACE majordomo disruptor project_options project_warnings)
+add_library(od_acquisition_worker INTERFACE acqWorker.hpp)
+target_include_directories(od_acquisition_worker INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/.)
+target_link_libraries(od_acquisition_worker INTERFACE od_acquisition majordomo disruptor project_options project_warnings)
 
-add_subdirectory(test)
+add_subdirectory(test)

src/service/acquisition/acqWorker.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENDIGITIZER_SERVICE_ACQWORKER_H
 #define OPENDIGITIZER_SERVICE_ACQWORKER_H
 
-#include "daq_api.hpp"
+#include <daq_api.hpp>
 #include <majordomo/Worker.hpp>
 #include <ranges>
 #include <string_view>

src/service/acquisition/test/CMakeLists.txt

@@ -1,3 +1,3 @@
 add_executable(acqWorkerTest acqWorker_test.cpp)
 target_include_directories(acqWorkerTest INTERFACE ../include)
-target_link_libraries(acqWorkerTest PRIVATE fmt ut od_acquisition client zmq)
+target_link_libraries(acqWorkerTest PRIVATE fmt ut od_acquisition_worker client zmq)

src/service/gnuradio/CMakeLists.txt

@@ -1,6 +1,5 @@
-
-add_library(od_gnuradio INTERFACE GnuRadioWorker.hpp)
-target_include_directories(od_gnuradio INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/.)
-target_link_libraries(od_gnuradio INTERFACE majordomo disruptor gr-basic yaml-cpp::yaml-cpp project_options project_warnings)
+add_library(od_gnuradio_worker INTERFACE GnuRadioWorker.hpp)
+target_include_directories(od_gnuradio_worker INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/.)
+target_link_libraries(od_gnuradio_worker INTERFACE od_acquisition majordomo disruptor gr-basic yaml-cpp::yaml-cpp project_options project_warnings)
 
 add_subdirectory(test)

src/service/gnuradio/GnuRadioWorker.hpp

@@ -1,7 +1,8 @@
 #ifndef OPENDIGITIZER_SERVICE_GNURADIOWORKER_H
 #define OPENDIGITIZER_SERVICE_GNURADIOWORKER_H
 
-#include "daq_api.hpp"
+#include <daq_api.hpp>
+
 #include <majordomo/Worker.hpp>
 
 #include <gnuradio-4.0/basic/DataSink.hpp>

src/service/gnuradio/test/CMakeLists.txt

@@ -1,4 +1,4 @@
 cmrc_add_resource_library(GNURADIO_WORKER_TEST_ASSETS ALIAS assets::grc NAMESPACE gnuradioWorkerTestFilesystem simple-counter.grc)
 
 add_executable(GnuRadioWorkerTest GnuRadioWorker_test.cpp)
-target_link_libraries(GnuRadioWorkerTest PRIVATE fmt ut od_gnuradio client zmq assets::grc)
+target_link_libraries(GnuRadioWorkerTest PRIVATE fmt ut od_gnuradio_worker client zmq assets::grc)

src/ui/CMakeLists.txt

@@ -88,6 +88,7 @@ if (EMSCRIPTEN)
     target_link_libraries(
             ${outputFileName}
             PRIVATE
+            function2::function2
             implot
             plf_colony
             app_header
@@ -106,6 +107,10 @@ if (EMSCRIPTEN)
             COMMENT start a python server serving the webassembly app
             DEPENDS ${outputFileName}
     )
+
+    # TODO should be pulled via linking od_acquisition, but that's outside the source folder (src/ui) for the ui-wasm build
+    target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../acquisition) #for daq_api.hpp
+
 else () # native build
 
     set(target_name "opendigitizer-ui")
@@ -118,6 +123,8 @@ else () # native build
     target_link_libraries(
             ${target_name}
             PRIVATE
+            od_acquisition
+            function2::function2
             SDL2
             implot
             imgui-node-editor
@@ -134,5 +141,3 @@ else () # native build
     target_compile_definitions(${target_name} PRIVATE BLOCKS_DIR="${GNURADIO_PREFIX}/share/gnuradio/grc/blocks/")
 endif()
 
-target_link_libraries(${target_name} PRIVATE function2::function2)
-target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../service/acquisition) #for daq_api.hpp

src/ui/flowgraph/remotedatasource.cpp

@@ -9,6 +9,8 @@
 
 #include "../app.h"
 
+using namespace opendigitizer::acq;
+
 namespace DigitizerUi {
 
 class RemoteBlockType : public BlockType {