mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-02-03 05:14:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix volk.h include path. It should be volk/volk.h

Browse Source
This commit is contained in:
Howard Su 2020-10-23 10:39:20 +08:00
parent e94888d533
commit 0fe5af9816
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/CMakeLists.txt
View File

@ -36,7 +36,6 @@ if (MSVC)
target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/") target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/")
# Volk # Volk
target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/volk/")
target_link_libraries(sdrpp_core PUBLIC volk) target_link_libraries(sdrpp_core PUBLIC volk)
# SoapySDR # SoapySDR
@ -65,8 +64,6 @@ if (MSVC)
endif (MSVC) endif (MSVC)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_include_directories(sdrpp_core PUBLIC "/usr/include/volk")
target_link_libraries(sdrpp_core PUBLIC pthread) target_link_libraries(sdrpp_core PUBLIC pthread)
target_link_libraries(sdrpp_core PUBLIC GL) target_link_libraries(sdrpp_core PUBLIC GL)
target_link_libraries(sdrpp_core PUBLIC GLEW) target_link_libraries(sdrpp_core PUBLIC GLEW)
@ -96,7 +93,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
${GLEW_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS}
${FFTW3_INCLUDE_DIRS} ${FFTW3_INCLUDE_DIRS}
${GLFW3_INCLUDE_DIRS} ${GLFW3_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS}/volk ${VOLK_INCLUDE_DIRS}
${PORTAUDIO_INCLUDE_DIRS} ${PORTAUDIO_INCLUDE_DIRS}
) )

2
core/src/dsp/block.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <vector> #include <vector>
#include <dsp/stream.h> #include <dsp/stream.h>
#include <volk.h> #include <volk/volk.h>
namespace dsp { namespace dsp {
template <class D, class I, class O, int IC, int OC> template <class D, class I, class O, int IC, int OC>

2
core/src/dsp/math.h
View File

@ -2,7 +2,7 @@
#include <thread> #include <thread>
#include <dsp/stream.h> #include <dsp/stream.h>
#include <dsp/types.h> #include <dsp/types.h>
#include <volk.h> #include <volk/volk.h>
#ifndef M_PI #ifndef M_PI
#define M_PI 3.1415926535f #define M_PI 3.1415926535f

1
core/src/dsp/source.h
View File

@ -2,7 +2,6 @@
#include <thread> #include <thread>
#include <dsp/stream.h> #include <dsp/stream.h>
#include <dsp/types.h> #include <dsp/types.h>
#include <volk.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
namespace dsp { namespace dsp {