From dd69d6e3c36f5ad393d3f27062375a28bc6a4187 Mon Sep 17 00:00:00 2001 From: Felix Wunsch Date: Sun, 9 Feb 2014 22:24:49 +0100 Subject: [PATCH] commit before esprit integration --- grc/CMakeLists.txt | 4 ++-- include/specest/CMakeLists.txt | 3 ++- lib/CMakeLists.txt | 3 +-- swig/specest_swig.i | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 44d059d..d224c26 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -16,11 +16,11 @@ # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. - install(FILES specest_reciprocal_ff.xml specest_pad_vector.xml specest_stream_to_vector_overlap.xml specest_moving_average_vff.xml - specest_adaptiveweighting_vff.xml DESTINATION share/gnuradio/grc/blocks + specest_adaptiveweighting_vff.xml + DESTINATION share/gnuradio/grc/blocks ) diff --git a/include/specest/CMakeLists.txt b/include/specest/CMakeLists.txt index b98ecf4..75d0c48 100644 --- a/include/specest/CMakeLists.txt +++ b/include/specest/CMakeLists.txt @@ -26,5 +26,6 @@ install(FILES pad_vector.h stream_to_vector_overlap.h moving_average_vff.h - adaptiveweighting_vff.h DESTINATION include/specest + adaptiveweighting_vff.h + DESTINATION include/specest ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4e979b1..223f786 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -24,14 +24,13 @@ include(GrPlatform) #define LIB_SUFFIX include_directories(${Boost_INCLUDE_DIR}) link_directories(${Boost_LIBRARY_DIRS}) - list(APPEND specest_sources reciprocal_ff_impl.cc pad_vector_impl.cc stream_to_vector_overlap_impl.cc moving_average_vff_impl.cc adaptiveweighting_vff_impl.cc -) + ) add_library(gnuradio-specest SHARED ${specest_sources}) target_link_libraries(gnuradio-specest ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES}) diff --git a/swig/specest_swig.i b/swig/specest_swig.i index ec0300e..8d13a44 100644 --- a/swig/specest_swig.i +++ b/swig/specest_swig.i @@ -26,3 +26,4 @@ GR_SWIG_BLOCK_MAGIC2(specest, stream_to_vector_overlap); GR_SWIG_BLOCK_MAGIC2(specest, moving_average_vff); %include "specest/adaptiveweighting_vff.h" GR_SWIG_BLOCK_MAGIC2(specest, adaptiveweighting_vff); +