diff --git a/CMakeLists.txt b/CMakeLists.txt index 412dfbd..a6c6e12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,9 @@ include(CMakePrintHelpers) include(CTest) 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_path(RAPIDJSON_INCLUDE_DIRS "rapidjson/allocators.h") find_package(ryml CONFIG REQUIRED) @@ -56,8 +59,9 @@ target_link_libraries(blah2 PRIVATE ryml::ryml httplib::httplib armadillo - fftw3 - fftw3_threads + FFTW3::fftw3 + FFTW3::fftw3f + FFTW3::fftw3l sdrplay ) target_include_directories(blah2 PRIVATE RAPIDJSON_INCLUDE_DIRS "rapidjson/allocators.h") @@ -69,7 +73,12 @@ add_executable(testAmbiguity src/data/Map.cpp src/process/ambiguity/Ambiguity.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 RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_TEST_UNIT_DIR}") diff --git a/Dockerfile b/Dockerfile index 0a8e395..2e44711 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="30hours " WORKDIR /blah2 ADD lib lib RUN apt-get update \ - && apt-get install -y g++ make cmake git curl zip unzip doxygen graphviz \ - libfftw3-dev pkg-config gfortran \ + && apt-get install -y g++ make cmake git curl zip unzip \ + doxygen graphviz pkg-config gfortran \ && apt-get autoremove -y \ && apt-get clean -y \ && 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 ENV PATH="/opt/vcpkg:${PATH}" VCPKG_ROOT=/opt/vcpkg RUN cd /blah2/lib && vcpkg integrate install \ - && vcpkg install --clean-after-build + && vcpkg install --clean-after-build --feature-flags=manifests # install SDRplay API RUN chmod +x /blah2/lib/sdrplay-3.0.7/SDRplay_RSP_API-Linux-3.07.1.run \ diff --git a/docker-compose.yml b/docker-compose.yml index f1fc340..8e4f41f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: network_mode: host privileged: true command: > - sh -c "/blah2/bin/blah2 -c config/config.yml" + sh -c "/blah2/bin/blah2 -c config/radar4.yml" container_name: blah2 blah2_frontend: diff --git a/html/js/plot_map.js b/html/js/plot_map.js index 8a162ab..6fea0f1 100644 --- a/html/js/plot_map.js +++ b/html/js/plot_map.js @@ -162,4 +162,4 @@ var intervalId = window.setInterval(function () { }) .always(function () { }); -}, 100); +}, 100); \ No newline at end of file diff --git a/lib/vcpkg.json b/lib/vcpkg.json index 3b1b31c..6442282 100644 --- a/lib/vcpkg.json +++ b/lib/vcpkg.json @@ -2,15 +2,17 @@ "name": "blah2", "version": "1.0.0", "dependencies": [ - { "name": "catch2", "version>=": "3.4.0" }, - { "name": "rapidjson", "version>=": "1.1.0" }, - { "name": "asio", "version>=": "1.28.0" }, - { "name": "cpp-httplib", "version>=": "0.12.2" }, - { "name": "armadillo", "version>=": "12.0.1" }, - { "name": "ryml", "version>=": "0.5.0" } + { "name": "fftw3", "features": ["threads"], "version>=": "3.3.10#8" }, + { "name": "catch2", "version>=": "3.4.0" }, + { "name": "rapidjson", "version>=": "1.1.0" }, + { "name": "asio", "version>=": "1.28.0" }, + { "name": "cpp-httplib", "version>=": "0.12.2" }, + { "name": "armadillo", "version>=": "12.0.1" }, + { "name": "ryml", "version>=": "0.5.0" } ], "builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00", "overrides": [ + { "name": "fftw3", "version": "3.3.10#8" }, { "name": "catch2", "version": "3.4.0" }, { "name": "rapidjson", "version": "1.1.0" }, { "name": "asio", "version": "1.28.0" },