Skip to content

Commit

Permalink
Add SigMF as a dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
anarkiwi committed Apr 2, 2024
1 parent 097d9eb commit fda3242
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
22 changes: 20 additions & 2 deletions bin/build.sh
Original file line number Diff line number Diff line change
@@ -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 ..
4 changes: 3 additions & 1 deletion bin/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions lib/uhd_sample_recorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit fda3242

Please sign in to comment.