Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Johnathan Corgan | 2013-08-27 | 1 | -0/+3 |
|\ | |||||
| * | runtime: Fixed runtime SWIG linker error | Nicholas Corgan | 2013-08-26 | 1 | -0/+3 |
| | | | | | | | | * gnuradio_runtime_EXPORTS is not defined for SWIG builds by default, so this fix manually sets it for the runtime_swig build | ||||
* | | Merge branch 'maint' | Tom Rondeau | 2013-07-24 | 2 | -69/+51 |
|\| | |||||
| * | build: more FindICE fixes so it doesn't get confused with multiple installs ↵ | Tom Rondeau | 2013-07-24 | 2 | -69/+51 |
| | | | | | | | | of ICE. | ||||
* | | Merge branch 'maint' | Tom Rondeau | 2013-07-24 | 1 | -28/+48 |
|\| | |||||
| * | build: fixes FindQwt cmake module to check that Qwt is >= 5.2.0. | Tom Rondeau | 2013-07-24 | 1 | -28/+48 |
| | | |||||
* | | Merge branch 'maint' | Tom Rondeau | 2013-07-23 | 1 | -0/+3 |
|\| | |||||
| * | cmake: fixed some differences between handling Ice 3.4 and 3.5. | Tom Rondeau | 2013-07-23 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'maint' | Johnathan Corgan | 2013-07-22 | 2 | -26/+212 |
|\| | |||||
| * | build: fix for finding and handling ICE 3.5 or 3.4 | Tom Rondeau | 2013-07-22 | 2 | -26/+212 |
| | | |||||
* | | Merge branch 'maint' | Johnathan Corgan | 2013-07-20 | 2 | -3/+3 |
|\| | |||||
| * | build: require Python v2 for build configuration | Jiri Pinkava | 2013-07-20 | 2 | -3/+3 |
| | | |||||
* | | cmake: Windows packages automatically include compiler runtime DLL's to ↵ | Nicholas Corgan | 2013-07-10 | 1 | -0/+5 |
|/ | | | | remove an installation step | ||||
* | cmake: for the GnuradioConfig cmake helper function, only set the most ↵ | Tom Rondeau | 2013-06-16 | 1 | -1/+1 |
| | | | | important components as required. | ||||
* | Merge branch 'maint' | Johnathan Corgan | 2013-06-09 | 2 | -142/+142 |
|\ | |||||
| * | cmake: convert CRLF to LF in in some modules (fixes #549) | Johnathan Corgan | 2013-06-09 | 2 | -156/+156 |
| | | |||||
* | | gr: added GR_TEST_ENVIRONS to GrTest | Josh Blum | 2013-06-05 | 1 | -0/+2 |
| | | |||||
* | | cmake: adding gnuradio-pmt to GnuradioConfig.cmake | Tim O'Shea | 2013-05-30 | 1 | -1/+2 |
| | | |||||
* | | cmake: updated GnuradioConfig script to look for renamed top_block.h file. | Tom Rondeau | 2013-05-25 | 1 | -24/+24 |
| | | |||||
* | | Merge remote-tracking branch 'osh/next' into next | Tom Rondeau | 2013-05-23 | 1 | -1/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-runtime/lib/CMakeLists.txt gnuradio-runtime/lib/gr_block_detail.cc gnuradio-runtime/lib/gr_realtime.cc gr-analog/swig/analog_swig.i | ||||
| * | | runtime: fix for gr_enabled_realtime_scheduling | Tim O'Shea | 2013-05-05 | 1 | -0/+28 |
| | | | |||||
| * | | libqwt.so should take precedence over libqwt-qt4.so (qwt6 vs qwt5) | Tim O'Shea | 2013-04-20 | 1 | -1/+1 |
| | | | |||||
| * | | search install prefix for qwt correctly | Tim O'Shea | 2013-04-20 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2013-05-23 | 5 | -4/+16 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'maint' | Johnathan Corgan | 2013-05-23 | 5 | -4/+16 |
| |\ \ | |||||
| | * | | Packaging work | Nicholas Corgan | 2013-05-21 | 5 | -4/+16 |
| | | | | | | | | | | | | | | | | | | | | * Added missing wxgui Python OpenGL dependency * Added Ubuntu 13.04 support | ||||
* | | | | Fix header include directory ordering | Michael Dickens | 2013-05-17 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-05-16 | 2 | -0/+988 |
|\| | | | |||||
| * | | | Merge remote-tracking branch 'ncorgan/nsis_improvements' | Johnathan Corgan | 2013-05-16 | 2 | -0/+988 |
| |\ \ \ | |||||
| | * | | | cmake: Added custom NSIS templates | Nicholas Corgan | 2013-04-12 | 2 | -0/+988 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Unused "gnuradio Desktop icon" option removed * GNU Radio Companion can now be accessed from the Start Menu | ||||
* | | | | | cleaning up files and references to gnuradio-core. | Tom Rondeau | 2013-05-14 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-05-09 | 1 | -121/+122 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts and updated for 3.7 changes: cmake/Modules/GnuradioConfig.cmake | ||||
| * | | | | cmake: updated GnuradioConfig.cmake file to look for headers installed in 3.6. | Tom Rondeau | 2013-05-09 | 1 | -17/+16 |
| | | | | | |||||
* | | | | | build: updated config cmake file for next changes. | Tom Rondeau | 2013-05-07 | 1 | -6/+4 |
| | | | | | |||||
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-05-07 | 2 | -0/+158 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt | ||||
| * | | | | build: fixed GnuradioConfig files for OOTs to use. | Tom Rondeau | 2013-05-07 | 2 | -0/+158 |
| |/ / / | |||||
* | | / | runtime: fix for gr_enabled_realtime_scheduling | Tim O'Shea | 2013-05-07 | 1 | -0/+28 |
| |_|/ |/| | | |||||
* | | | update FindGnuradio.cmake to use the standard method for libgnuradio-pmt | Tim O'Shea | 2013-04-18 | 1 | -17/+2 |
| | | | |||||
* | | | cmake: always find PMT includes in FindGnuradio.cmake | Tim O'Shea | 2013-04-18 | 1 | -0/+17 |
| | | | |||||
* | | | build: removed last references to GRUEL. | Tom Rondeau | 2013-04-01 | 10 | -20/+0 |
| | | | | | | | | | | | | Also update qa_runtime to pull in qa_pmt tests. | ||||
* | | | build: parallel build handling of runtime swig and swig docs. | Tom Rondeau | 2013-04-01 | 1 | -1/+1 |
| | | | |||||
* | | | runtime: creating swig files for typedefs/templates of vector types. | Tom Rondeau | 2013-04-01 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | Also created simple ctrlport swig file to clean things up. Consolidated all standard vector types into gr_types.i. | ||||
* | | | runtime: fix parallel builds, make -j working again | Johnathan Corgan | 2013-03-27 | 1 | -1/+1 |
| | | | |||||
* | | | updates to FindGnuradio.cmake for core->runtime rename | Tim O'Shea | 2013-03-27 | 1 | -5/+5 |
| | | | |||||
* | | | runtime: migrate remaining gnuradio-core contents into gnuradio-runtime | Johnathan Corgan | 2013-03-26 | 1 | -0/+1 |
| | | | |||||
* | | | cmake: added a FindGnuradio.cmake module that other programs can use to ↵ | Tim O'Shea | 2013-03-13 | 1 | -0/+105 |
| | | | | | | | | | | | | easily link against various components of GNU Radio. | ||||
* | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-13 | 3 | -44/+70 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-audio/lib/CMakeLists.txt gr-blocks/include/blocks/CMakeLists.txt gr-blocks/include/blocks/socket_pdu.h gr-blocks/lib/CMakeLists.txt gr-blocks/swig/blocks_swig.i gr-comedi/src/CMakeLists.txt gr-howto-write-a-block/lib/CMakeLists.txt gr-noaa/lib/CMakeLists.txt gr-qtgui/lib/CMakeLists.txt gr-uhd/lib/CMakeLists.txt gr-vocoder/lib/CMakeLists.txt gr-wavelet/lib/CMakeLists.txt | ||||
| * | | log: fixes to replace log4cxx with log4cpp. | Tom Rondeau | 2013-03-13 | 2 | -16/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'gr3.7_log4cpp' | Tom Rondeau | 2013-03-13 | 3 | -44/+77 |
| |\ \ | |||||
| | * | | Converted gr_logger to use log4cpp | user | 2013-03-12 | 2 | -16/+77 |
| |/ / |