diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-29 17:31:06 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-01 16:23:06 -0700 |
| commit | f74d3dae8f2ec423c61932b4ad0359f98b996a51 (patch) | |
| tree | 1e16eb3537829248c177b04209acce3fe2bead96 /gr-fft | |
| parent | eea0e411411303ea94953c5cd8454c4139a474ff (diff) | |
gruel: moved gruel into subdirs of gnuradio-runtime.
PMTs are handled slightly different and are installed into their own module and include dir.
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fft/include/fft/api.h | 2 | ||||
| -rw-r--r-- | gr-fft/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fft/swig/CMakeLists.txt | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index 9133303d9b..37c0294cbf 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -30,7 +30,6 @@ find_package(FFTW3f) include(GrComponent) GR_REGISTER_COMPONENT("gr-fft" ENABLE_GR_FFT - ENABLE_GRUEL ENABLE_VOLK Boost_FOUND ENABLE_GNURADIO_RUNTIME diff --git a/gr-fft/include/fft/api.h b/gr-fft/include/fft/api.h index eef4563738..a569ceb265 100644 --- a/gr-fft/include/fft/api.h +++ b/gr-fft/include/fft/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_FFT_API_H #define INCLUDED_FFT_API_H -#include <gruel/attributes.h> +#include <attributes.h> #ifdef gnuradio_fft_EXPORTS # define FFT_API __GR_ATTR_EXPORT diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index 6c0c18eaa0..20fb338465 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -25,7 +25,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${GR_FFT_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} ) diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt index 2545edece4..dae7abb6df 100644 --- a/gr-fft/swig/CMakeLists.txt +++ b/gr-fft/swig/CMakeLists.txt @@ -26,7 +26,6 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_FFT_INCLUDE_DIRS} ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} ) |