diff options
| author | Josh Blum | 2011-09-05 22:35:52 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-09-05 22:35:52 -0700 |
| commit | 7628cff158a4bddaef5f38dc649ea9047008ed48 (patch) | |
| tree | 18d32766d5dc97be3f24a5cedf38d018194d1f1c /gr-digital/CMakeLists.txt | |
| parent | f535cd0f1fbc7cfc753f5abbe99251a50cd32acb (diff) | |
| parent | 65fbbb8f752ebf522ac2628f850445e66a278e2f (diff) | |
| download | gnuradio-7628cff158a4bddaef5f38dc649ea9047008ed48.tar.gz gnuradio-7628cff158a4bddaef5f38dc649ea9047008ed48.tar.bz2 gnuradio-7628cff158a4bddaef5f38dc649ea9047008ed48.zip | |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h
gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h
gr-digital/lib/digital_constellation.h
gr-digital/lib/digital_constellation_receiver_cb.h
gr-digital/lib/digital_fll_band_edge_cc.h
gr-digital/lib/digital_mpsk_receiver_cc.h
Diffstat (limited to 'gr-digital/CMakeLists.txt')
| -rw-r--r-- | gr-digital/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt index cc00da69a..bd11be4d3 100644 --- a/gr-digital/CMakeLists.txt +++ b/gr-digital/CMakeLists.txt @@ -33,6 +33,7 @@ GR_REGISTER_COMPONENT("gr-digital" ENABLE_GR_DIGITAL GR_SET_GLOBAL(GR_DIGITAL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/lib + ${CMAKE_CURRENT_SOURCE_DIR}/hier ) GR_SET_GLOBAL(GR_DIGITAL_SWIG_INCLUDE_DIRS @@ -81,11 +82,13 @@ CPACK_COMPONENT("digital_swig" ######################################################################## # Add subdirectories ######################################################################## +GR_INCLUDE_SUBDIRECTORY(hier) #appends to lib sources ADD_SUBDIRECTORY(lib) IF(ENABLE_PYTHON) ADD_SUBDIRECTORY(swig) ADD_SUBDIRECTORY(python) ADD_SUBDIRECTORY(grc) + ADD_SUBDIRECTORY(examples) ENDIF(ENABLE_PYTHON) ######################################################################## |