mirror of
https://github.com/30hours/blah2.git
synced 2024-11-08 12:25:42 +00:00
WIP on pr-branch: addb8c4
Remove unnecessary volumes from docker-compose
This commit is contained in:
commit
f169fc038b
5 changed files with 25 additions and 14 deletions
|
@ -8,6 +8,9 @@ include(CMakePrintHelpers)
|
||||||
include(CTest)
|
include(CTest)
|
||||||
|
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
|
find_package(FFTW3 CONFIG REQUIRED)
|
||||||
|
find_package(FFTW3f CONFIG REQUIRED)
|
||||||
|
find_package(FFTW3l CONFIG REQUIRED)
|
||||||
find_package(asio CONFIG REQUIRED)
|
find_package(asio CONFIG REQUIRED)
|
||||||
find_path(RAPIDJSON_INCLUDE_DIRS "rapidjson/allocators.h")
|
find_path(RAPIDJSON_INCLUDE_DIRS "rapidjson/allocators.h")
|
||||||
find_package(ryml CONFIG REQUIRED)
|
find_package(ryml CONFIG REQUIRED)
|
||||||
|
@ -56,8 +59,9 @@ target_link_libraries(blah2 PRIVATE
|
||||||
ryml::ryml
|
ryml::ryml
|
||||||
httplib::httplib
|
httplib::httplib
|
||||||
armadillo
|
armadillo
|
||||||
fftw3
|
FFTW3::fftw3
|
||||||
fftw3_threads
|
FFTW3::fftw3f
|
||||||
|
FFTW3::fftw3l
|
||||||
sdrplay
|
sdrplay
|
||||||
)
|
)
|
||||||
target_include_directories(blah2 PRIVATE RAPIDJSON_INCLUDE_DIRS "rapidjson/allocators.h")
|
target_include_directories(blah2 PRIVATE RAPIDJSON_INCLUDE_DIRS "rapidjson/allocators.h")
|
||||||
|
@ -69,7 +73,12 @@ add_executable(testAmbiguity
|
||||||
src/data/Map.cpp
|
src/data/Map.cpp
|
||||||
src/process/ambiguity/Ambiguity.cpp
|
src/process/ambiguity/Ambiguity.cpp
|
||||||
src/process/meta/HammingNumber.cpp)
|
src/process/meta/HammingNumber.cpp)
|
||||||
target_link_libraries(testAmbiguity PRIVATE Catch2::Catch2WithMain fftw3 fftw3_threads)
|
target_link_libraries(testAmbiguity PRIVATE
|
||||||
|
Catch2::Catch2WithMain
|
||||||
|
FFTW3::fftw3
|
||||||
|
FFTW3::fftw3f
|
||||||
|
FFTW3::fftw3l
|
||||||
|
)
|
||||||
set_target_properties(testAmbiguity PROPERTIES
|
set_target_properties(testAmbiguity PROPERTIES
|
||||||
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_TEST_UNIT_DIR}")
|
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_TEST_UNIT_DIR}")
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,8 @@ LABEL maintainer="30hours <nathan@30hours.dev>"
|
||||||
WORKDIR /blah2
|
WORKDIR /blah2
|
||||||
ADD lib lib
|
ADD lib lib
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y g++ make cmake git curl zip unzip doxygen graphviz \
|
&& apt-get install -y g++ make cmake git curl zip unzip \
|
||||||
libfftw3-dev pkg-config gfortran \
|
doxygen graphviz pkg-config gfortran \
|
||||||
&& apt-get autoremove -y \
|
&& apt-get autoremove -y \
|
||||||
&& apt-get clean -y \
|
&& apt-get clean -y \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
@ -15,7 +15,7 @@ RUN git clone https://github.com/microsoft/vcpkg /opt/vcpkg \
|
||||||
&& /opt/vcpkg/bootstrap-vcpkg.sh
|
&& /opt/vcpkg/bootstrap-vcpkg.sh
|
||||||
ENV PATH="/opt/vcpkg:${PATH}" VCPKG_ROOT=/opt/vcpkg
|
ENV PATH="/opt/vcpkg:${PATH}" VCPKG_ROOT=/opt/vcpkg
|
||||||
RUN cd /blah2/lib && vcpkg integrate install \
|
RUN cd /blah2/lib && vcpkg integrate install \
|
||||||
&& vcpkg install --clean-after-build
|
&& vcpkg install --clean-after-build --feature-flags=manifests
|
||||||
|
|
||||||
# install SDRplay API
|
# install SDRplay API
|
||||||
RUN chmod +x /blah2/lib/sdrplay-3.0.7/SDRplay_RSP_API-Linux-3.07.1.run \
|
RUN chmod +x /blah2/lib/sdrplay-3.0.7/SDRplay_RSP_API-Linux-3.07.1.run \
|
||||||
|
|
|
@ -21,7 +21,7 @@ services:
|
||||||
network_mode: host
|
network_mode: host
|
||||||
privileged: true
|
privileged: true
|
||||||
command: >
|
command: >
|
||||||
sh -c "/blah2/bin/blah2 -c config/config.yml"
|
sh -c "/blah2/bin/blah2 -c config/radar4.yml"
|
||||||
container_name: blah2
|
container_name: blah2
|
||||||
|
|
||||||
blah2_frontend:
|
blah2_frontend:
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
"name": "blah2",
|
"name": "blah2",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
{ "name": "fftw3", "features": ["threads"], "version>=": "3.3.10#8" },
|
||||||
{ "name": "catch2", "version>=": "3.4.0" },
|
{ "name": "catch2", "version>=": "3.4.0" },
|
||||||
{ "name": "rapidjson", "version>=": "1.1.0" },
|
{ "name": "rapidjson", "version>=": "1.1.0" },
|
||||||
{ "name": "asio", "version>=": "1.28.0" },
|
{ "name": "asio", "version>=": "1.28.0" },
|
||||||
|
@ -11,6 +12,7 @@
|
||||||
],
|
],
|
||||||
"builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00",
|
"builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00",
|
||||||
"overrides": [
|
"overrides": [
|
||||||
|
{ "name": "fftw3", "version": "3.3.10#8" },
|
||||||
{ "name": "catch2", "version": "3.4.0" },
|
{ "name": "catch2", "version": "3.4.0" },
|
||||||
{ "name": "rapidjson", "version": "1.1.0" },
|
{ "name": "rapidjson", "version": "1.1.0" },
|
||||||
{ "name": "asio", "version": "1.28.0" },
|
{ "name": "asio", "version": "1.28.0" },
|
||||||
|
|
Loading…
Reference in a new issue