summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
...
| * | Added Windows DLL resource filesNicholas Corgan2013-03-051-1/+7
* | | Merge remote-tracking branch 'ncorgan/dll-rc-info_next' into nextTom Rondeau2013-03-051-1/+7
|\ \ \
| * | | Added Windows DLL resource files to next-only branchesNicholas Corgan2013-03-041-1/+7
* | | | Merge branch 'master' into nextTom Rondeau2013-03-041-6/+6
|\ \ \ \ | | |/ / | |/| |
| * | | log: fixing build if log4cxx is not installed.Tom Rondeau2013-03-041-6/+6
* | | | Merge branch 'master' into nextTom Rondeau2013-03-041-3/+3
|\| | |
| * | | log: more minor fixups integrating gr-logger.Tom Rondeau2013-03-041-3/+3
* | | | Merge branch 'master' into nextTom Rondeau2013-03-032-0/+69
|\| | | | |/ / |/| |
| * | log: adding default loggers to all gr_blocks to make using them simpler.Tom Rondeau2013-03-031-17/+26
| * | Merge branch 'master' into gr_logTom Rondeau2013-03-018-9/+298
| |\|
| * | Merge branch 'master' into gr_logTom Rondeau2012-09-0613-140/+117
| |\ \
| * | | log: fixed gr_log to be usable in Python.Tom Rondeau2012-06-131-0/+2
| * | | Fixing up the gr-log capabilities.Tom Rondeau2012-06-082-1/+33
| * | | core: Adds a gr-log concept for easy logging at various levels.Tom Rondeau2012-06-071-0/+28
* | | | Merge branch 'master' into nextTom Rondeau2013-02-261-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | cmake: adding Boost version 104601 to list of bad Boosts.Tom Rondeau2013-02-261-1/+1
* | | | Merge branch 'master' into nextJohnathan Corgan2013-02-211-0/+2
|\| | |
| * | | cmake: Added chrono as a necessary Boost library under MSVCNicholas Corgan2013-02-191-0/+2
* | | | Merge branch 'master' into nextTom Rondeau2013-02-131-4/+14
|\| | |
| * | | build: allowing user to override check for bad versions of boost.Tom Rondeau2013-02-131-4/+14
| * | | Merge remote-tracking branch 'ncorgan/cmake_boost_fix' into maintJohnathan Corgan2013-02-071-2/+2
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'ncorgan/fedora-18-cmake' into maintJohnathan Corgan2013-02-071-0/+12
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' into nextTom Rondeau2013-02-062-2/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'ncorgan/fedora-18-cmake'Tom Rondeau2013-02-061-0/+12
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | cmake: Added Fedora 18 packaging informationNicholas Corgan2013-01-171-0/+12
| * | | | | | Merge remote-tracking branch 'ncorgan/cmake_boost_fix'Tom Rondeau2013-02-061-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | cmake: Allows Unix systems with /usr/lib64 to use Boost installations in non-...Nicholas Corgan2013-02-011-2/+2
| | |/ / /
* | | | | Merge branch 'master' into nextTom Rondeau2013-02-051-3/+27
|\| | | |
| * | | | build: disable certain Boost versions we know are buggy to fix Issue #513.Tom Rondeau2013-02-051-3/+27
| |/ / /
* | | | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ...Michael L Dickens2013-01-041-0/+156
|\| | |
| * | | GrUseQt4 -> GrSetupQt4, since that's what it really does.Michael L Dickens2013-01-031-0/+0
| * | | GNU Radio version of CMake's "UseQt4" script, which determines header (INCLUD...Michael L Dickens2013-01-011-0/+156
* | | | Merge branch 'master' into nextJohnathan Corgan2012-12-291-1/+2
|\| | |
| * | | Merge branch 'maint'Johnathan Corgan2012-12-291-1/+2
| |\ \ \
| | * | | cmake: removed Boost 1.52 from allowed versionsmaint-3.6.2Johnathan Corgan2012-12-291-1/+2
* | | | | ctrlport: fix in cmake for OSX builds of ctrlport.Tom Rondeau2012-12-061-0/+11
* | | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2012-12-041-3/+7
|\ \ \ \ \
| * | | | | Merge branch 'master' into nextJohnathan Corgan2012-12-041-3/+7
| |\| | | |
| | * | | | Merge branch 'maint'Johnathan Corgan2012-12-041-3/+7
| | |\| | |
| | | * | | swig: tweaks for swig makedependJosh Blum2012-12-041-3/+7
| | * | | | Merge branch 'maint'Johnathan Corgan2012-12-011-2/+0
| | |\| | |
* | | | | | Merging ctrlport2 into next branch.Tom Rondeau2012-12-031-0/+73
|/ / / / /
* | | | | Merge branch 'master' into nextJohnathan Corgan2012-12-011-2/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint'Johnathan Corgan2012-12-011-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Revert "Force swig compile ordering in gnuradio-core"Johnathan Corgan2012-12-011-2/+0
| * | | | | Merge branch 'maint'Johnathan Corgan2012-12-011-2/+0
| |\ \ \ \ \
| | * | | | | Revert "Force swig compile ordering in gnuradio-core"Johnathan Corgan2012-12-011-2/+0
* | | | | | | Merge branch 'master' into nextJohnathan Corgan2012-12-011-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'maint'Johnathan Corgan2012-12-011-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | cmake: fix typo in cmake swig moduleJohnathan Corgan2012-12-011-1/+1
| | |/ / /