Merge pull request #25 from IQTLabs/sigmfdep

Add SigMF as a dependency.

bin/build.sh

@@ -1,4 +1,22 @@
 #!/bin/bash
 set -e
-cd VkFFT && mkdir build && cd build && CMAKE_BUILD_TYPE=Release cmake -DGLSLANG_GIT_TAG=13.0.0 .. && make -j $(nproc) && cd ../.. && \
-  mkdir build && cd build && cmake ../lib && make -j $(nproc) && cd ..
+cd VkFFT && mkdir build && cd build && CMAKE_BUILD_TYPE=Release cmake -DGLSLANG_GIT_TAG=13.0.0 .. && make -j $(nproc) && cd ../..
+mkdir -p flatbuffers/build
+cd flatbuffers/build
+cmake ..
+make -j $(nproc)
+sudo make install
+cd ../..
+mkdir -p json/build
+cd json/build
+cmake ..
+make -j $(nproc)
+sudo make install
+cd ../..
+mkdir -p libsigmf/build
+cd libsigmf/build
+cmake -DUSE_SYSTEM_JSON=ON -DUSE_SYSTEM_FLATBUFFERS=ON ..
+make -j $(nproc)
+sudo make install
+cd ../..
+mkdir build && cd build && cmake ../lib && make -j $(nproc) && cd ..

bin/install-deps.sh

@@ -13,5 +13,7 @@ sudo apt-get update && sudo apt-get install -qy \
   wget \
   && \
   wget https://sourceforge.net/projects/sigpack/files/sigpack-1.2.7.zip -O sigpack.zip && unzip sigpack.zip && ln -s sigpack-*/sigpack . && \
-  wget https://github.com/nlohmann/json/releases/download/v3.11.2/json.hpp && \
+  git clone https://github.com/google/flatbuffers -b v23.5.26 && \
+  git clone https://github.com/nlohmann/json -b v3.11.2 && \
+  git clone https://github.com/deepsig/libsigmf -b v1.0.2 && \
   git clone https://github.com/DTolm/VkFFT -b v1.3.4

lib/CMakeLists.txt

@@ -10,6 +10,8 @@ include(CTest)
 find_package(Vulkan REQUIRED)
 find_package(Armadillo REQUIRED)
 find_package(UHD 3.15.0 REQUIRED)
+find_package(nlohmann_json 3.11.2 REQUIRED)
+
 find_package(
   Boost ${Boost_Version}
   COMPONENTS filesystem iostreams thread unit_test_framework program_options

lib/uhd_sample_recorder.cpp

@@ -5,15 +5,14 @@
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
+#include <nlohmann/json.hpp>
 #include <thread>
 #include <uhd/exception.hpp>
 #include <uhd/types/tune_request.hpp>
 #include <uhd/usrp/multi_usrp.hpp>
 #include <uhd/utils/safe_main.hpp>
 #include <uhd/utils/thread.hpp>
 
-#include "json.hpp"
-
 #include "sample_pipeline.h"
 #include "sample_writer.h"