summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Johnathan Corgan2013-08-271-0/+3
|\
| * runtime: Fixed runtime SWIG linker errorNicholas Corgan2013-08-261-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 Rondeau2013-07-242-69/+51
|\|
| * build: more FindICE fixes so it doesn't get confused with multiple installs ↵Tom Rondeau2013-07-242-69/+51
| | | | | | | | of ICE.
* | Merge branch 'maint'Tom Rondeau2013-07-241-28/+48
|\|
| * build: fixes FindQwt cmake module to check that Qwt is >= 5.2.0.Tom Rondeau2013-07-241-28/+48
| |
* | Merge branch 'maint'Tom Rondeau2013-07-231-0/+3
|\|
| * cmake: fixed some differences between handling Ice 3.4 and 3.5.Tom Rondeau2013-07-231-0/+3
| |
* | Merge branch 'maint'Johnathan Corgan2013-07-222-26/+212
|\|
| * build: fix for finding and handling ICE 3.5 or 3.4Tom Rondeau2013-07-222-26/+212
| |
* | Merge branch 'maint'Johnathan Corgan2013-07-202-3/+3
|\|
| * build: require Python v2 for build configurationJiri Pinkava2013-07-202-3/+3
| |
* | cmake: Windows packages automatically include compiler runtime DLL's to ↵Nicholas Corgan2013-07-101-0/+5
|/ | | | remove an installation step
* cmake: for the GnuradioConfig cmake helper function, only set the most ↵Tom Rondeau2013-06-161-1/+1
| | | | important components as required.
* Merge branch 'maint'Johnathan Corgan2013-06-092-142/+142
|\
| * cmake: convert CRLF to LF in in some modules (fixes #549)Johnathan Corgan2013-06-092-156/+156
| |
* | gr: added GR_TEST_ENVIRONS to GrTestJosh Blum2013-06-051-0/+2
| |
* | cmake: adding gnuradio-pmt to GnuradioConfig.cmakeTim O'Shea2013-05-301-1/+2
| |
* | cmake: updated GnuradioConfig script to look for renamed top_block.h file.Tom Rondeau2013-05-251-24/+24
| |
* | Merge remote-tracking branch 'osh/next' into nextTom Rondeau2013-05-231-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_schedulingTim O'Shea2013-05-051-0/+28
| | |
| * | libqwt.so should take precedence over libqwt-qt4.so (qwt6 vs qwt5)Tim O'Shea2013-04-201-1/+1
| | |
| * | search install prefix for qwt correctlyTim O'Shea2013-04-201-0/+5
| | |
* | | Merge branch 'master' into nextJohnathan Corgan2013-05-235-4/+16
|\ \ \ | | |/ | |/|
| * | Merge branch 'maint'Johnathan Corgan2013-05-235-4/+16
| |\ \
| | * | Packaging workNicholas Corgan2013-05-215-4/+16
| | | | | | | | | | | | | | | | | | | | * Added missing wxgui Python OpenGL dependency * Added Ubuntu 13.04 support
* | | | Fix header include directory orderingMichael Dickens2013-05-171-2/+4
| | | |
* | | | Merge branch 'master' into nextJohnathan Corgan2013-05-162-0/+988
|\| | |
| * | | Merge remote-tracking branch 'ncorgan/nsis_improvements'Johnathan Corgan2013-05-162-0/+988
| |\ \ \
| | * | | cmake: Added custom NSIS templatesNicholas Corgan2013-04-122-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 Rondeau2013-05-141-5/+5
| | | | |
* | | | | Merge branch 'master' into nextTom Rondeau2013-05-091-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 Rondeau2013-05-091-17/+16
| | | | |
* | | | | build: updated config cmake file for next changes.Tom Rondeau2013-05-071-6/+4
| | | | |
* | | | | Merge branch 'master' into nextTom Rondeau2013-05-072-0/+158
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt
| * | | | build: fixed GnuradioConfig files for OOTs to use.Tom Rondeau2013-05-072-0/+158
| |/ / /
* | | / runtime: fix for gr_enabled_realtime_schedulingTim O'Shea2013-05-071-0/+28
| |_|/ |/| |
* | | update FindGnuradio.cmake to use the standard method for libgnuradio-pmtTim O'Shea2013-04-181-17/+2
| | |
* | | cmake: always find PMT includes in FindGnuradio.cmakeTim O'Shea2013-04-181-0/+17
| | |
* | | build: removed last references to GRUEL.Tom Rondeau2013-04-0110-20/+0
| | | | | | | | | | | | Also update qa_runtime to pull in qa_pmt tests.
* | | build: parallel build handling of runtime swig and swig docs.Tom Rondeau2013-04-011-1/+1
| | |
* | | runtime: creating swig files for typedefs/templates of vector types.Tom Rondeau2013-04-011-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 againJohnathan Corgan2013-03-271-1/+1
| | |
* | | updates to FindGnuradio.cmake for core->runtime renameTim O'Shea2013-03-271-5/+5
| | |
* | | runtime: migrate remaining gnuradio-core contents into gnuradio-runtimeJohnathan Corgan2013-03-261-0/+1
| | |
* | | cmake: added a FindGnuradio.cmake module that other programs can use to ↵Tim O'Shea2013-03-131-0/+105
| | | | | | | | | | | | easily link against various components of GNU Radio.
* | | Merge branch 'master' into nextTom Rondeau2013-03-133-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 Rondeau2013-03-132-16/+9
| | |
| * | Merge remote-tracking branch 'gr3.7_log4cpp'Tom Rondeau2013-03-133-44/+77
| |\ \
| | * | Converted gr_logger to use log4cppuser2013-03-122-16/+77
| |/ /