From a7afbf205a543967ee949f6b6409c2a295e6905d Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Tue, 1 May 2012 16:59:58 -0400
Subject: fft: enabling doc and grc subdirs.
---
gr-fft/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gr-fft')
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt
index 9ee3383413..7d76dc7f93 100644
--- a/gr-fft/CMakeLists.txt
+++ b/gr-fft/CMakeLists.txt
@@ -89,10 +89,10 @@ add_subdirectory(lib)
if(ENABLE_PYTHON)
add_subdirectory(swig)
add_subdirectory(python)
-# add_subdirectory(grc)
+ add_subdirectory(grc)
endif(ENABLE_PYTHON)
#add_subdirectory(examples)
-#add_subdirectory(doc)
+add_subdirectory(doc)
########################################################################
# Create Pkg Config File
--
cgit v1.2.3
From 7f8331808f99a9747bed39e55bbee98bc58c6038 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 2 May 2012 11:45:29 -0400
Subject: build: reworking cmake structure for include and lib directories. I
think this is cleaner.
We also probably don't need the link_directories (according to the cmake guys, this is no longer necessary).
---
gr-fft/lib/CMakeLists.txt | 11 ++++-------
gr-filter/lib/CMakeLists.txt | 16 ++++++----------
gr-wavelet/lib/CMakeLists.txt | 9 +++------
3 files changed, 13 insertions(+), 23 deletions(-)
(limited to 'gr-fft')
diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt
index e2f17a1830..ea1248fbac 100644
--- a/gr-fft/lib/CMakeLists.txt
+++ b/gr-fft/lib/CMakeLists.txt
@@ -21,19 +21,16 @@
# Setup the include and linker paths
########################################################################
include_directories(
- ${GNURADIO_CORE_INCLUDE_DIRS}
- ${GR_FFT_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
+ ${GNURADIO_CORE_INCLUDE_DIRS}
+ ${GR_FFT_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
+ ${FFTW3F_INCLUDE_DIRS}
)
-include_directories(${FFT_INCLUDE_DIRS})
link_directories(${FFT_LIBRARY_DIRS})
-
-include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
-
-include_directories(${FFTW3F_INCLUDE_DIRS})
link_directories(${FFTW3F_LIBRARY_DIRS})
########################################################################
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt
index 0ffdb75fc3..2850b69254 100644
--- a/gr-filter/lib/CMakeLists.txt
+++ b/gr-filter/lib/CMakeLists.txt
@@ -21,22 +21,18 @@
# Setup the include and linker paths
########################################################################
include_directories(
- ${GNURADIO_CORE_INCLUDE_DIRS}
- ${VOLK_INCLUDE_DIRS}
+ ${GR_FILTER_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
+ ${VOLK_INCLUDE_DIRS}
+ ${GNURADIO_CORE_INCLUDE_DIRS}
+ ${GR_FFT_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
+ ${FFTW3F_INCLUDE_DIRS}
)
-include_directories(${FILTER_INCLUDE_DIRS})
-link_directories(${FILTER_LIBRARY_DIRS})
-
-include_directories(${FFT_INCLUDE_DIRS})
link_directories(${FFT_LIBRARY_DIRS})
-
-include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
-
-include_directories(${FFTW3F_INCLUDE_DIRS})
link_directories(${FFTW3F_LIBRARY_DIRS})
########################################################################
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index f0d9068b75..3247c17b53 100644
--- a/gr-wavelet/lib/CMakeLists.txt
+++ b/gr-wavelet/lib/CMakeLists.txt
@@ -21,19 +21,16 @@
# Setup the include and linker paths
########################################################################
include_directories(
- ${GNURADIO_CORE_INCLUDE_DIRS}
${GR_WAVELET_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
+ ${GNURADIO_CORE_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
+ ${GSL_INCLUDE_DIRS}
)
-include_directories(${WAVELET_INCLUDE_DIRS})
link_directories(${WAVELET_LIBRARY_DIRS})
-
-include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
-
-include_directories(${GSL_INCLUDE_DIRS})
link_directories(${GSL_LIBRARY_DIRS})
########################################################################
--
cgit v1.2.3
From 38120d6ba5b805f522e74c0e440e487f673cb82e Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 2 May 2012 11:59:25 -0400
Subject: fft: export the FFTW malloc and free helper functions.
---
gr-fft/include/fft/fft.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'gr-fft')
diff --git a/gr-fft/include/fft/fft.h b/gr-fft/include/fft/fft.h
index 5cc2e21e81..e3fd3f278a 100644
--- a/gr-fft/include/fft/fft.h
+++ b/gr-fft/include/fft/fft.h
@@ -37,15 +37,15 @@ namespace gr {
/*! \brief Helper function for allocating complex fft buffers
*/
- gr_complex* malloc_complex(int size);
+ FFT_API gr_complex* malloc_complex(int size);
/*! \brief Helper function for allocating float fft buffers
*/
- float* malloc_float(int size);
+ FFT_API float* malloc_float(int size);
/*! \brief Helper function for freeing fft buffers
*/
- void free(void *b);
+ FFT_API void free(void *b);
/*!
* \brief Export reference to planner mutex for those apps that
--
cgit v1.2.3
From 1befbf0d16d95037fb699f40845abbcb02e86d79 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 15 May 2012 15:53:27 -0700
Subject: fft: should not export for static class member
---
gr-fft/include/fft/fft_vcc.h | 2 +-
gr-fft/include/fft/fft_vfc.h | 2 +-
gr-fft/include/fft/goertzel_fc.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'gr-fft')
diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/fft/fft_vcc.h
index 561ae858d2..cb07b166d2 100644
--- a/gr-fft/include/fft/fft_vcc.h
+++ b/gr-fft/include/fft/fft_vcc.h
@@ -40,7 +40,7 @@ namespace gr {
* \brief Compute forward or reverse FFT. complex vector in / complex vector out.
* \ingroup dft_blk
*/
- static FFT_API sptr make(int fft_size, bool forward,
+ static sptr make(int fft_size, bool forward,
const std::vector<float> &window,
bool shift=false, int nthreads=1);
diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/fft/fft_vfc.h
index fc48ceefea..ec441d66a8 100644
--- a/gr-fft/include/fft/fft_vfc.h
+++ b/gr-fft/include/fft/fft_vfc.h
@@ -40,7 +40,7 @@ namespace gr {
* \brief Compute forward or reverse FFT. float vector in / complex vector out.
* \ingroup dft_blk
*/
- static FFT_API sptr make(int fft_size, bool forward,
+ static sptr make(int fft_size, bool forward,
const std::vector<float> &window,
int nthreads=1);
diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/fft/goertzel_fc.h
index 4d3fa8dcf8..5b3c8f1c49 100644
--- a/gr-fft/include/fft/goertzel_fc.h
+++ b/gr-fft/include/fft/goertzel_fc.h
@@ -40,7 +40,7 @@ namespace gr {
* \brief Goertzel single-bin DFT calculation.
* \ingroup dft_blk
*/
- static FFT_API sptr make(int rate, int len, float freq);
+ static sptr make(int rate, int len, float freq);
virtual void set_freq (float freq) = 0;
--
cgit v1.2.3
From 06c325cb925555d1864d67db20490eb67402868d Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Tue, 3 Jul 2012 14:22:41 -0700
Subject: swig: added GR_SWIG_TARGET_DEPS core_swig to other swig builds
I have not encountered an issue, however this is the correct thing to do.
Now individual components swig builds depend on the gr core swig target.
Conflicts:
gr-filter/swig/CMakeLists.txt
---
gr-atsc/src/lib/CMakeLists.txt | 2 ++
gr-audio/swig/CMakeLists.txt | 2 ++
gr-comedi/src/CMakeLists.txt | 2 ++
gr-digital/swig/CMakeLists.txt | 2 +-
gr-fcd/swig/CMakeLists.txt | 2 ++
gr-fft/swig/CMakeLists.txt | 2 ++
gr-noaa/swig/CMakeLists.txt | 2 ++
gr-pager/swig/CMakeLists.txt | 2 ++
gr-qtgui/swig/CMakeLists.txt | 2 ++
gr-shd/swig/CMakeLists.txt | 2 ++
gr-trellis/src/lib/CMakeLists.txt | 4 +++-
gr-uhd/swig/CMakeLists.txt | 2 ++
gr-video-sdl/src/CMakeLists.txt | 2 ++
gr-vocoder/swig/CMakeLists.txt | 2 ++
gr-wavelet/swig/CMakeLists.txt | 2 ++
15 files changed, 30 insertions(+), 2 deletions(-)
(limited to 'gr-fft')
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt
index dc51f0c902..39dbefa60f 100644
--- a/gr-atsc/src/lib/CMakeLists.txt
+++ b/gr-atsc/src/lib/CMakeLists.txt
@@ -204,6 +204,8 @@ if(ENABLE_PYTHON)
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_ATSC_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-audio/swig/CMakeLists.txt b/gr-audio/swig/CMakeLists.txt
index 4997ca3f7d..fab3666609 100644
--- a/gr-audio/swig/CMakeLists.txt
+++ b/gr-audio/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_AUDIO_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 1d3d16908b..5291e4d905 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -67,6 +67,8 @@ if(ENABLE_PYTHON)
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_COMEDI_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
index 0c129e181e..df5f04148c 100644
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@ -113,7 +113,7 @@ set(GR_SWIG_INCLUDE_DIRS
# Setup swig docs to depend on includes and pull in from build directory
set(GR_SWIG_LIBRARIES gnuradio-digital)
-set(GR_SWIG_TARGET_DEPS digital_generated_includes)
+set(GR_SWIG_TARGET_DEPS digital_generated_includes core_swig)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i)
set(GR_SWIG_DOC_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/../include
diff --git a/gr-fcd/swig/CMakeLists.txt b/gr-fcd/swig/CMakeLists.txt
index f715c47856..73676ae6ac 100644
--- a/gr-fcd/swig/CMakeLists.txt
+++ b/gr-fcd/swig/CMakeLists.txt
@@ -25,6 +25,8 @@ include(GrSwig)
#set(GR_SWIG_FLAGS -DGR_HAVE_FCD) #needed to parse fcd_swig.i
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_FCD_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt
index 7ea41f220e..3276669857 100644
--- a/gr-fft/swig/CMakeLists.txt
+++ b/gr-fft/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_FFT_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt
index a8335062cb..a336bf8a43 100644
--- a/gr-noaa/swig/CMakeLists.txt
+++ b/gr-noaa/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_NOAA_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-pager/swig/CMakeLists.txt b/gr-pager/swig/CMakeLists.txt
index 9a8d9d0d8b..0fa8e6ee5b 100644
--- a/gr-pager/swig/CMakeLists.txt
+++ b/gr-pager/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_PAGER_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index 9f092f6c6e..e84035b9f7 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
${GR_QTGUI_INCLUDE_DIRS}
diff --git a/gr-shd/swig/CMakeLists.txt b/gr-shd/swig/CMakeLists.txt
index b61adfcad5..878b80c0f4 100644
--- a/gr-shd/swig/CMakeLists.txt
+++ b/gr-shd/swig/CMakeLists.txt
@@ -25,6 +25,8 @@ include(GrSwig)
set(GR_SWIG_FLAGS -DGR_HAVE_SHD) #needed to parse shd_swig.i
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_SHD_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt
index 9080afa56e..8f29f9605b 100644
--- a/gr-trellis/src/lib/CMakeLists.txt
+++ b/gr-trellis/src/lib/CMakeLists.txt
@@ -187,7 +187,7 @@ if(ENABLE_PYTHON)
trellis_siso_combined_f.i
trellis_constellation_metrics_cf.i
${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i
- ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i
+ ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
COMPONENT "trellis_swig"
)
@@ -198,6 +198,8 @@ if(ENABLE_PYTHON)
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_SOURCE_DEPS
${generated_trellis_includes}
${generated_trellis_swigs}
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
index 26470b3b96..795b46567c 100644
--- a/gr-uhd/swig/CMakeLists.txt
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -25,6 +25,8 @@ include(GrSwig)
set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_UHD_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
index c21c9a9c86..a5c5b8cbd2 100644
--- a/gr-video-sdl/src/CMakeLists.txt
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -66,6 +66,8 @@ if(ENABLE_PYTHON)
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_COMEDI_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
index aaf09700f2..da89370feb 100644
--- a/gr-vocoder/swig/CMakeLists.txt
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_VOCODER_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt
index 2c5f433ebb..4c78575f8e 100644
--- a/gr-wavelet/swig/CMakeLists.txt
+++ b/gr-wavelet/swig/CMakeLists.txt
@@ -23,6 +23,8 @@
include(GrPython)
include(GrSwig)
+set(GR_SWIG_TARGET_DEPS core_swig)
+
set(GR_SWIG_INCLUDE_DIRS
${GR_WAVELET_INCLUDE_DIRS}
${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
--
cgit v1.2.3