mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-14 03:39:53 +03:00
124 lines
2.3 KiB
Diff
124 lines
2.3 KiB
Diff
--- ./src/cli/Main.cpp.orig
|
|
+++ ./src/cli/Main.cpp
|
|
@@ -7,7 +7,7 @@
|
|
#include "core/Log.hpp"
|
|
#include "run/Runner.hpp"
|
|
|
|
-#include <CLI/CLI.hpp>
|
|
+#include "CLI/CLI.hpp"
|
|
|
|
#include <cstdlib>
|
|
#include <iostream>
|
|
--- ./src/cli/Format.hpp.orig
|
|
+++ ./src/cli/Format.hpp
|
|
@@ -3,7 +3,7 @@
|
|
|
|
#pragma once
|
|
|
|
-#include <CLI/CLI.hpp>
|
|
+#include "CLI/CLI.hpp"
|
|
|
|
namespace signal_estimator {
|
|
|
|
--- ./src/base/core/Frame.hpp.orig
|
|
+++ ./src/base/core/Frame.hpp
|
|
@@ -8,7 +8,7 @@
|
|
#include "core/Sample.hpp"
|
|
#include "core/Time.hpp"
|
|
|
|
-#include <intrusive_shared_ptr/intrusive_shared_ptr.h>
|
|
+#include "intrusive_shared_ptr/intrusive_shared_ptr.h"
|
|
|
|
#include <atomic>
|
|
#include <cassert>
|
|
--- ./CMakeLists.txt
|
|
+++ ./CMakeLists.txt
|
|
@@ -12,8 +12,12 @@
|
|
|
|
set(TOOLCHAIN_PREFIX "" CACHE STRING "target host triplet, e.g. aarch64-linux-gnu")
|
|
include("cmake/SetupToolchain.cmake")
|
|
-include("cmake/ThirdParty.cmake")
|
|
|
|
+find_package(kissfft)
|
|
+include_directories(/usr/include/kissfft)
|
|
+find_package(spdlog)
|
|
+include_directories(/usr/include/spdlog)
|
|
+
|
|
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
|
|
|
|
set(CMAKE_CXX_STANDARD 17)
|
|
@@ -142,10 +146,6 @@
|
|
src/base/run/Runner.cpp
|
|
)
|
|
|
|
-add_dependencies(base_objects
|
|
- ${ALL_DEPENDENCIES}
|
|
-)
|
|
-
|
|
target_compile_options(base_objects
|
|
PRIVATE ${COMPILER_FLAGS}
|
|
)
|
|
@@ -164,10 +164,6 @@
|
|
src/cli/Print.cpp
|
|
)
|
|
|
|
-add_dependencies(signal-estimator
|
|
- ${ALL_DEPENDENCIES}
|
|
-)
|
|
-
|
|
set(ALL_EXECUTABLES)
|
|
list(APPEND ALL_EXECUTABLES
|
|
signal-estimator
|
|
@@ -188,6 +184,9 @@
|
|
target_link_libraries(signal-estimator
|
|
base_objects
|
|
m
|
|
+ asound
|
|
+ fmt
|
|
+ kissfft-float
|
|
)
|
|
|
|
install(
|
|
@@ -220,10 +219,6 @@
|
|
${GENERATED_SOURCES}
|
|
)
|
|
|
|
- add_dependencies(generated_objects
|
|
- ${ALL_DEPENDENCIES}
|
|
- )
|
|
-
|
|
target_include_directories(generated_objects
|
|
PRIVATE src/base
|
|
)
|
|
@@ -238,10 +233,6 @@
|
|
src/gui/SignalEstimator.cpp
|
|
)
|
|
|
|
- add_dependencies(signal-estimator-gui
|
|
- ${ALL_DEPENDENCIES}
|
|
- )
|
|
-
|
|
list(APPEND ALL_EXECUTABLES
|
|
signal-estimator-gui
|
|
)
|
|
@@ -273,6 +264,9 @@
|
|
${QWT_LIBRARY}
|
|
Qt5::Core
|
|
Qt5::Widgets
|
|
+ asound
|
|
+ fmt
|
|
+ kissfft-float
|
|
)
|
|
|
|
install(
|
|
@@ -291,10 +285,6 @@
|
|
test/TestMovPercentile.cpp
|
|
test/TestSchmittTrigger.cpp
|
|
test/TestTextReporter.cpp
|
|
- )
|
|
-
|
|
- add_dependencies(signal-estimator-test
|
|
- ${ALL_DEPENDENCIES}
|
|
)
|
|
|
|
list(APPEND ALL_EXECUTABLES
|