Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ↵ | Michael L Dickens | 2013-01-04 | 2 | -1/+4 |
|\ | | | | | | | of the INCLUDE_DIRS order | ||||
| * | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ↵ | Michael L Dickens | 2013-01-01 | 2 | -1/+4 |
| | | | | | | | | ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio). | ||||
* | | grc: updating GRC exmaples for new component changes. | Tom Rondeau | 2012-12-27 | 1 | -1/+1 |
| | | |||||
* | | filter: moved window around so it's available in both gr-fft and gr-filter. | Tom Rondeau | 2012-12-27 | 4 | -2/+183 |
| | | |||||
* | | blocks: removes blocks moved to gr-blocks from gnuradio-core. | Tom Rondeau | 2012-12-21 | 4 | -15/+19 |
| | | | | | | | | Also fixes up some other missing moves. | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2012-12-12 | 1 | -2/+0 |
|\| | | | | | | | | | Conflicts: gr-digital/swig/CMakeLists.txt | ||||
| * | build: removing core_swig from GR_SWIG_TARGET_DEPS. Seems to have been the ↵ | Tom Rondeau | 2012-12-12 | 1 | -2/+0 |
| | | | | | | | | cause of the parallel build woes. | ||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-14 | 2 | -9/+12 |
|\| | | | | | | | | | | | | | | | | | Conflicts: gr-atsc/src/lib/CMakeLists.txt gr-digital/python/CMakeLists.txt gr-trellis/src/python/CMakeLists.txt gr-vocoder/python/CMakeLists.txt gr-wavelet/python/CMakeLists.txt | ||||
| * | fft: restore FFTW3F_THREADS support for fft.cc | Josh Blum | 2012-11-14 | 1 | -0/+5 |
| | | |||||
| * | fft: removed non-existant FFT_LIBRARY_DIRS FFT_LIBRARIES | Josh Blum | 2012-11-14 | 1 | -2/+0 |
| | | |||||
| * | gr: same change for common PYTHON test paths | Josh Blum | 2012-11-14 | 1 | -7/+7 |
| | | | | | | | | | | | | | | Conflicts: gr-analog/python/CMakeLists.txt gr-blocks/python/CMakeLists.txt | ||||
| * | gr: set a common GR_TEST_TARGET_DEPS for all module unit tests | Josh Blum | 2012-11-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each unit test shares common dependencies, but we have been neglecting to set these. In this changeset, we set one top level GR_TEST_TARGET_DEPS, and simply append module-specific dependencies for each test. This also helps to fix QA tests on windows which were missing the dependencies list. Conflicts: gr-analog/python/CMakeLists.txt gr-blocks/python/CMakeLists.txt | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2012-11-10 | 1 | -1/+1 |
|\| | |||||
| * | fft: fixing float-in, complex-out fft block to use the right io sig. | Tom Rondeau | 2012-11-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-04 | 1 | -1/+1 |
|\| | |||||
| * | gr: added python -B everywhere for clean source tree | Josh Blum | 2012-11-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote branch 'reynwar/comments_next' into next | Johnathan Corgan | 2012-08-28 | 1 | -12/+24 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/include/digital_constellation.h gr-digital/python/bpsk.py gr-digital/python/qpsk.py | ||||
* | | | fft: adding missing item to cmake install. | Tom Rondeau | 2012-08-22 | 1 | -0/+1 |
| | | | |||||
* | | | core: fixing location of some components for the new hierarchy. | Tom Rondeau | 2012-08-22 | 5 | -1/+260 |
| | | | | | | | | | | | | ctest and digital examples working again. | ||||
* | | | fft: fixed names of FFT GRC blocks. | Tom Rondeau | 2012-08-20 | 3 | -2/+2 |
|/ / | | | | | | | GRC files are installed into a flat directory; use prefix to keep from having a name collision. | ||||
* | | Merge branch 'next' into qtsink_menus | Tom Rondeau | 2012-07-17 | 1 | -0/+2 |
|\| | |||||
| * | Merge branch 'maint' | Johnathan Corgan | 2012-07-03 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | Conflicts: gruel/src/swig/CMakeLists.txt | ||||
| | * | swig: added GR_SWIG_TARGET_DEPS core_swig to other swig builds | Johnathan Corgan | 2012-07-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | fft: adding a malloc for doubles. | Tom Rondeau | 2012-07-03 | 2 | -2/+12 |
|/ / | | | | | | | In core for master, also exporting symbols for use externally. | ||||
* | | Merge branch 'gr_filter' | Johnathan Corgan | 2012-06-20 | 2 | -10/+7 |
|\ \ | |/ |/| | |||||
| * | fft: export the FFTW malloc and free helper functions. | Tom Rondeau | 2012-05-02 | 1 | -3/+3 |
| | | |||||
| * | build: reworking cmake structure for include and lib directories. I think ↵ | Tom Rondeau | 2012-05-02 | 1 | -7/+4 |
| | | | | | | | | | | | | this is cleaner. We also probably don't need the link_directories (according to the cmake guys, this is no longer necessary). | ||||
* | | Merge branch 'sphinxdocs' | Tom Rondeau | 2012-05-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixing cmake doc dependencies for gr-fft and gr-wavelet. | Ben Reynwar | 2012-05-22 | 1 | -1/+1 |
| | | | |||||
* | | | fft: should not export for static class member | Josh Blum | 2012-05-15 | 3 | -3/+3 |
| |/ |/| | |||||
* | | fft: enabling doc and grc subdirs. | Tom Rondeau | 2012-05-01 | 1 | -2/+2 |
|/ | |||||
* | fft: put helper classes in namespace | Johnathan Corgan | 2012-04-29 | 14 | -638/+665 |
| | |||||
* | fft: make interface functions pure virtual | Johnathan Corgan | 2012-04-29 | 3 | -23/+11 |
| | |||||
* | gr-fft: creates a gr-fft top-level component. | Tom Rondeau | 2012-04-27 | 31 | -0/+2317 |