summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* runtime: build structure updates so ControlPort is usable in QA and once inst...Tom Rondeau2013-03-271-0/+7
* runtime: migrate remaining gnuradio-core contents into gnuradio-runtimeJohnathan Corgan2013-03-261-4/+4
* Merge branch 'ofdm-master' into ofdm-nextJohnathan Corgan2013-03-151-1/+0
|\
| * Squash/rebased martin/ofdm-master onto trial merge branchMartin Braun2013-03-151-2/+1
* | Merge branch 'master' into nextTom Rondeau2013-03-131-0/+1
|\|
| * log: fixes to replace log4cxx with log4cpp.Tom Rondeau2013-03-131-3/+0
| * Merge remote-tracking branch 'gr3.7_log4cpp'Tom Rondeau2013-03-131-0/+3
| |\
| | * Converted gr_logger to use log4cppuser2013-03-121-0/+3
| * | MSVC fixesNicholas Corgan2013-03-121-0/+1
| |/
* | build: adding GR_CTRLPORT definition to config.hTom Rondeau2013-03-051-0/+4
* | Merge branch 'master' into nextTom Rondeau2013-03-051-0/+24
|\|
| * build: install our cmake modules into share/gnuradio/cmake/Modules.Tom Rondeau2013-03-051-0/+8
| * build: create and install a config.h so external projects can know what we bu...Tom Rondeau2013-03-051-0/+16
* | Merge branch 'master' into nextTom Rondeau2013-03-031-0/+3
|\|
| * Merge branch 'master' into gr_logTom Rondeau2013-03-011-2/+29
| |\
| | * Update version to 3.6.5gitJohnathan Corgan2013-02-261-2/+2
| | * Update release version to 3.6.4v3.6.4Johnathan Corgan2013-02-261-1/+1
| * | Merge branch 'master' into gr_logTom Rondeau2012-09-061-5/+8
| |\ \
| * | | Fixing up the gr-log capabilities.Tom Rondeau2012-06-081-0/+3
* | | | Merge branch 'master' into nextTom Rondeau2013-02-071-0/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | sched: adding in perf counters to measure performance of blocks during exectu...Tom Rondeau2013-02-071-0/+8
| * | | cmake: updated revision to 3.6.4git post-releasev3.6.4gitJohnathan Corgan2013-01-081-2/+2
| * | | cmake: update revision to 3.6.3 for releasev3.6.3Johnathan Corgan2013-01-081-1/+1
| * | | cmake: update revision to 3.6.3rc0v3.6.3rc0Johnathan Corgan2012-12-231-2/+2
| * | | core: to make ctest able to import pmts in-tree.Tom Rondeau2012-12-101-0/+2
* | | | build: fixes to build with PMTs and ControlPort.Tom Rondeau2012-12-071-0/+2
* | | | Merge branch 'master' into nextJohnathan Corgan2012-12-071-0/+7
|\| | |
| * | | core: added gr_tuntap_pdu, gr_socket_pdu, and msg passing enhancementsTim O'Shea2012-12-071-0/+7
* | | | ctrlport: fixing up controlport integration into gnuradio-core for merge with...Tom Rondeau2012-12-031-0/+1
* | | | cmake: don't put etc under /usr.Tom Rondeau2012-11-281-1/+10
* | | | gr: reorder new components in order of dependencyJosh Blum2012-11-141-4/+3
* | | | Merge branch 'master' into nextJohnathan Corgan2012-11-141-0/+8
|\| | |
| * | | Merge branch 'maint'Johnathan Corgan2012-11-141-0/+8
| |\ \ \
| | * | | fft: added gnuradio-fft dep for some testsJosh Blum2012-11-141-7/+8
| | * | | gr: same change for common PYTHON test pathsJosh Blum2012-11-141-0/+4
| | * | | gr: set a common GR_TEST_TARGET_DEPS for all module unit testsJosh Blum2012-11-141-0/+3
* | | | | fec: add new top-level component for FEC blocksJohnathan Corgan2012-11-121-0/+1
* | | | | channels: adding new component gr-channels to hold channel models.Tom Rondeau2012-11-101-0/+1
* | | | | Merge branch 'master' into nextJohnathan Corgan2012-10-011-0/+1
|\| | | |
| * | | | Merge branch 'wip/gr-blocks-master'Johnathan Corgan2012-10-011-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into wip/gr-blocks-masterJohnathan Corgan2012-09-051-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'master' into wip/gr-blocks-masterJohnathan Corgan2012-07-031-3/+0
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into wip/gr-blocks-masterJohnathan Corgan2012-06-201-2/+7
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge commit 'v3.6.1' into wip/gr-blocks-masterJohnathan Corgan2012-06-111-1/+1
| | |\ \ \ \ \ \
| | * | | | | | | blocks: adds new top-level component gr-blocks with first blockJohnathan Corgan2012-06-081-0/+1
* | | | | | | | | Merge branch 'master' into nextTom Rondeau2012-09-231-1/+2
|\| | | | | | | |
| * | | | | | | | analog: adding gr-analog component with.Tom Rondeau2012-09-231-1/+2
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | build: update revision to 3.6.3git3.6.3gitJohnathan Corgan2012-09-041-2/+2
| | |_|_|_|/ / | |/| | | | |
| * | | | | | build: update revision to 3.6.2v3.6.2Johnathan Corgan2012-09-041-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into nextJohnathan Corgan2012-07-031-3/+0
|\| | | | |