summaryrefslogtreecommitdiff
path: root/gnuradio-core/CMakeLists.txt
AgeCommit message (Collapse)Author
2013-01-13gras: support changeset for 3.6.4Josh Blum
used volk from next branch cf5c930d89ac89ba5a0da4a616c88d3c37e018ae for grextras support (it uses the dispatcher) empty stubs for the gr_basic_block msg passing. This is going to be difficult to figure out. The alias stuff may or may not be related most qa pass, there seems to be some additional issues, will be working through them on futher commits Conflicts: gnuradio-core/CMakeLists.txt gnuradio-core/src/lib/runtime/CMakeLists.txt gnuradio-core/src/lib/runtime/gr_block.cc gnuradio-core/src/lib/runtime/gr_block.h gnuradio-core/src/lib/runtime/gr_hier_block2.h gnuradio-core/src/lib/runtime/gr_top_block.h gnuradio-core/src/python/gnuradio/gr/__init__.py gr-audio/examples/c++/CMakeLists.txt gr-fcd/examples/c++/CMakeLists.txt grc/python/Port.py
2013-01-03Reorder SWIG_INCLUDE_DIRSMichael L Dickens
2013-01-01Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ↵Michael L Dickens
ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio).
2012-12-04Merge branch 'maint'Johnathan Corgan
2012-12-04core: moving Boost_INCLUDE_DIRS to be lastJosh Blum
2012-11-28build: set Boost_INCLUDE_DIRS for components (mostly for OSX and Windows).Tom Rondeau
2012-11-27Revert "Revert "Merge remote branch 'jblum-github/python_blocks2' into master""Tom Rondeau
This reverts commit 3a142bebafdc018bccc80cf124a375b53db03581. Since updating __init__.py for ticket 181, we should have fixed the same bug that was being seen here. Conflicts: gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
2012-07-07Revert "Merge remote branch 'jblum-github/python_blocks2' into master"Johnathan Corgan
This reverts commit f8581fb475267e1a97eaab962e423559fb4bfce2, reversing changes made to 73800434abfb8c6efcf069222b5f0fea9c86870b.
2012-07-01Merge remote branch 'jblum-github/python_blocks2' into masterJohnathan Corgan
Conflicts: gnuradio-core/CMakeLists.txt gnuradio-core/src/lib/general/general.i
2012-06-16cmake: add support for SYSCONFDIRChí-Thanh Christopher Nguyễn
Set with 'cmake -DSYSCONFDIR=target ...' This fixes http://gnuradio.org/redmine/issues/492
2012-06-12new block, gr_annotator_rawTim O'Shea
allows passing a raw pmt k->v pair from outside the flowgraph/python in at exact samples also added GRUEL autogenerated .i files to gnuradio-core-swig include line
2012-04-17this is squashed python blocks supportJosh Blum
2012-04-13Removed whitespace and added dtools/bin/remove-whitespace as a tool to do ↵Tom Rondeau
this in the future. The sed script was provided by Moritz Fischer.
2012-04-04Merge remote branch 'tom/cmake_builds' into nextJohnathan Corgan
2012-04-03Rework example directories. Gets rid of gnuradio-examples, moves these to ↵Tom Rondeau
more appropriate components. gnuradio-core and grc now have their own examples directories for files directly related to them.
2012-04-01wavelet: move wavelet blocks to new top-level componentJohnathan Corgan
2011-11-16work on swig docs, added to core and digitalJosh Blum
2011-10-23core: Making gnuradio-core dependent on Volk. This means you HAVE to have ↵Tom Rondeau
Volk build in order to build GNU Radio. Volk is now a 'first-class citizen.'
2011-10-20tags: added swigging for gr_tags headerJosh Blum
2011-10-19core: forgot to remove extra underJosh Blum
2011-10-08gr: the CMakeLists.txt took a chill pillJosh Blum
2011-09-05Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum
Conflicts: gr-trellis/src/lib/trellis_permutation.h
2011-08-03core: removed modification of includedir for pc file, its not needed and was ↵Josh Blum
messing it up
2011-08-02core: dont set boost vars for gnuradio-core.pcJosh Blum
If this is useful, it should be in gruel.pc; but gruel.pc has no private libs or boost dirs. Also, the substitution of absolute boost library paths is bad for cross builds (even native ones)
2011-08-02cmake: language tweak for component group descriptionJosh Blum
2011-07-20gr: squashed cmakelists.txt into one commitJosh Blum