Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ | |||||
| * | Added Windows DLL resource files | Nicholas Corgan | 2013-03-05 | 1 | -1/+7 |
| | | |||||
* | | Merge remote-tracking branch 'ncorgan/dll-rc-info_next' into next | Tom Rondeau | 2013-03-05 | 1 | -1/+7 |
|\ \ | |||||
| * | | Added Windows DLL resource files to next-only branches | Nicholas Corgan | 2013-03-04 | 1 | -1/+7 |
| | | | |||||
* | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-04 | 1 | -6/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | log: fixing build if log4cxx is not installed. | Tom Rondeau | 2013-03-04 | 1 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-04 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc | ||||
| * | | log: more minor fixups integrating gr-logger. | Tom Rondeau | 2013-03-04 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-03 | 2 | -0/+69 |
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | log: adding default loggers to all gr_blocks to make using them simpler. | Tom Rondeau | 2013-03-03 | 1 | -17/+26 |
| | | | | | | | | | | | | log: improving logger configuration and default behavior. log: changed name from gr_log to gr_logger (felt it could be confuse with the math function log). docs: moved logging information out to its own page. | ||||
| * | Merge branch 'master' into gr_log | Tom Rondeau | 2013-03-01 | 8 | -9/+298 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * \ | Merge branch 'master' into gr_log | Tom Rondeau | 2012-09-06 | 13 | -140/+117 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt cmake/Modules/GrMiscUtils.cmake docs/doxygen/other/build_guide.dox gnuradio-core/CMakeLists.txt gr-digital/lib/CMakeLists.txt | ||||
| * | | | log: fixed gr_log to be usable in Python. | Tom Rondeau | 2012-06-13 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Works with log4cxx installed and not installed. | ||||
| * | | | Fixing up the gr-log capabilities. | Tom Rondeau | 2012-06-08 | 2 | -1/+33 |
| | | | | | | | | | | | | | | | | Better handling of enable/disable function, easier integration with all components if log4cxx is or is not there. All components have been updated to be able to use logging. Docs update, too. | ||||
| * | | | core: Adds a gr-log concept for easy logging at various levels. | Tom Rondeau | 2012-06-07 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | Uses log4cxx and is optional. Macro based and macros are simple pass-throughs if this dependency does not exist or if the gr-log is disabled. | ||||
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-26 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | cmake: adding Boost version 104601 to list of bad Boosts. | Tom Rondeau | 2013-02-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-02-21 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/gr_random_pdu.cc volk/apps/volk_profile.cc | ||||
| * | | | cmake: Added chrono as a necessary Boost library under MSVC | Nicholas Corgan | 2013-02-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-13 | 1 | -4/+14 |
|\| | | | |||||
| * | | | build: allowing user to override check for bad versions of boost. | Tom Rondeau | 2013-02-13 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | Use -DENABLE_BAD_BOOST=True to use one of these Boost versions. | ||||
| * | | | Merge remote-tracking branch 'ncorgan/cmake_boost_fix' into maint | Johnathan Corgan | 2013-02-07 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'ncorgan/fedora-18-cmake' into maint | Johnathan Corgan | 2013-02-07 | 1 | -0/+12 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'master' into next | Tom Rondeau | 2013-02-06 | 2 | -2/+14 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'ncorgan/fedora-18-cmake' | Tom Rondeau | 2013-02-06 | 1 | -0/+12 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | cmake: Added Fedora 18 packaging information | Nicholas Corgan | 2013-01-17 | 1 | -0/+12 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'ncorgan/cmake_boost_fix' | Tom Rondeau | 2013-02-06 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | | | |||||
| | * | | | | cmake: Allows Unix systems with /usr/lib64 to use Boost installations in ↵ | Nicholas Corgan | 2013-02-01 | 1 | -2/+2 |
| | |/ / / | | | | | | | | | | | | | | | | non-standard locations | ||||
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-05 | 1 | -3/+27 |
|\| | | | | |||||
| * | | | | build: disable certain Boost versions we know are buggy to fix Issue #513. | Tom Rondeau | 2013-02-05 | 1 | -3/+27 |
| |/ / / | | | | | | | | | | | | | Creates a new list of version to test against. If any version matches the list of bad versions, set Boost to Not Found. | ||||
* | | | | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ↵ | Michael L Dickens | 2013-01-04 | 1 | -0/+156 |
|\| | | | | | | | | | | | | | | | of the INCLUDE_DIRS order | ||||
| * | | | GrUseQt4 -> GrSetupQt4, since that's what it really does. | Michael L Dickens | 2013-01-03 | 1 | -0/+0 |
| | | | | |||||
| * | | | GNU Radio version of CMake's "UseQt4" script, which determines header ↵ | Michael L Dickens | 2013-01-01 | 1 | -0/+156 |
| | | | | | | | | | | | | | | | | (INCLUDE) and library directories, but requires that the including script add use them (via INCLUDE_DIRECTORIES and LINK_DIRECTORIES) | ||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-12-29 | 1 | -1/+2 |
|\| | | | |||||
| * | | | Merge branch 'maint' | Johnathan Corgan | 2012-12-29 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | cmake: removed Boost 1.52 from allowed versionsmaint-3.6.2 | Johnathan Corgan | 2012-12-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | See https://svn.boost.org/trac/boost/ticket/7669 | ||||
* | | | | | ctrlport: fix in cmake for OSX builds of ctrlport. | Tom Rondeau | 2012-12-06 | 1 | -0/+11 |
| | | | | | |||||
* | | | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2012-12-04 | 1 | -3/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-12-04 | 1 | -3/+7 |
| |\| | | | | |||||
| | * | | | | Merge branch 'maint' | Johnathan Corgan | 2012-12-04 | 1 | -3/+7 |
| | |\| | | | |||||
| | | * | | | swig: tweaks for swig makedepend | Josh Blum | 2012-12-04 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * only search %include/import in .i files * when in regular headers use #include * stop adding all inc paths when file found | ||||
| | * | | | | Merge branch 'maint' | Johnathan Corgan | 2012-12-01 | 1 | -2/+0 |
| | |\| | | | |||||
* | | | | | | Merging ctrlport2 into next branch. | Tom Rondeau | 2012-12-03 | 1 | -0/+73 |
|/ / / / / |