Johnathan Corgan
f18d111e1c
Merge branch 'master' into qtapp
...
Conflicts:
CMakeLists.txt
lib/air_modes_preamble.cc
python/sql.py
2012-10-07 17:54:03 -07:00
Johnathan Corgan
20630ec6d1
cmake: additional fixes from GNU Radio HOWTO
...
* Fix include dir in FindGruel
* Remove QUIET option that requires CMake 2.8.2, not yet on all distros
2012-10-06 08:49:17 -07:00
Johnathan Corgan
f1a5c676b7
Fixed erroneous include dir variable
...
FindGnuradioCore was only working if GNU Radio was installed in
typical paths, since the pkg-config variable was wrong.
This was fixed in GNU Radio HOWTO a while back.
2012-09-30 11:51:14 -07:00
Nick Foster
93410c03df
Update cmake modules from Gnuradio to fix parallel build bug
2012-08-20 14:24:42 -07:00
Nick Foster
ee542ded35
Update cmake modules from Gnuradio to fix parallel build bug
2012-08-20 14:23:56 -07:00
Nick Foster
6d6917f06b
Apparently forgot to git add this very important file.
2012-08-20 10:26:29 -07:00
Nick Foster
ec70a90bd5
CMake magic to find PyQt4 and build the main GUI from .ui. Also renamed uhd_modes.py -> modes_rx, and the GUI app -> modes_gui
2012-07-05 11:00:52 -07:00
Nick Foster
8522bc0b25
CMakeified almost everything. Test code in python/ and apps other than uhd_modes.py still need minor updating.
2011-12-14 10:17:16 -08:00
