summaryrefslogtreecommitdiff
path: root/gr-howto-write-a-block/cmake/Modules
Commit message (Collapse)AuthorAgeFilesLines
* howto: removed gr-howto-write-a-blockJohnathan Corgan2013-03-2710-1172/+0
| | | | | | the canonical out-of-tree module is now in: gr-utils/python/modtool/gr-newmod
* runtime: migrate remaining gnuradio-core contents into gnuradio-runtimeJohnathan Corgan2013-03-261-3/+3
|
* Merge branch 'master' into nextTom Rondeau2013-03-133-44/+74
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: replacing log4cxx with log4cpp.Tom Rondeau2013-03-132-16/+74
| |
| * Merge remote-tracking branch 'gr3.7_log4cpp'Tom Rondeau2013-03-131-28/+0
| |
* | Merge branch 'master' into nextTom Rondeau2013-03-041-15/+26
|\| | | | | | | | | Conflicts: gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc
| * log: more minor fixups integrating gr-logger.Tom Rondeau2013-03-041-15/+26
| |
* | Merge branch 'master' into nextTom Rondeau2013-03-032-0/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/CMakeLists.txt gnuradio-core/gnuradio-core.conf gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc gnuradio-core/src/lib/runtime/runtime.i gr-atsc/src/lib/CMakeLists.txt gr-audio/lib/CMakeLists.txt gr-comedi/src/CMakeLists.txt gr-digital/lib/CMakeLists.txt gr-howto-write-a-block/CMakeLists.txt gr-howto-write-a-block/lib/CMakeLists.txt gr-noaa/lib/CMakeLists.txt gr-qtgui/lib/CMakeLists.txt gr-trellis/src/lib/CMakeLists.txt gr-uhd/lib/CMakeLists.txt gr-video-sdl/src/CMakeLists.txt gr-vocoder/lib/CMakeLists.txt gr-wavelet/lib/CMakeLists.txt
| * Merge branch 'master' into gr_logTom Rondeau2013-03-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/Modules/GrMiscUtils.cmake docs/doxygen/other/main_page.dox gnuradio-core/gnuradio-core.conf.in gnuradio-core/src/lib/swig/CMakeLists.txt gr-digital/lib/CMakeLists.txt gr-howto-write-a-block/CMakeLists.txt gr-qtgui/lib/CMakeLists.txt gr-video-sdl/src/CMakeLists.txt
| * | howto: adding gr_log checks to build.Tom Rondeau2012-06-082-0/+60
| | |
* | | Merge branch 'master' into nextJohnathan Corgan2012-12-011-1/+1
|\ \ \ | | |/ | |/|
| * | cmake: fix typo in cmake swig moduleJohnathan Corgan2012-12-011-1/+1
| |/
* / howto: updated howto-write-a-block to use new impl style.Tom Rondeau2012-09-301-0/+36
|/
* Removed whitespace and added dtools/bin/remove-whitespace as a tool to do ↵Tom Rondeau2012-04-134-16/+16
| | | | | | this in the future. The sed script was provided by Moritz Fischer.
* Merge branch 'master' into nextJohnathan Corgan2012-02-052-4/+4
|
* Merge branch 'master' into nextJohnathan Corgan2011-12-122-2/+2
|
* Removed autotools, gr-waveform, some cleanupJohnathan Corgan2011-12-088-0/+1035
Nick Foster owes Nick Corgan a six-pack of beer!