diff options
author | Josh Blum | 2011-09-28 22:59:51 -0700 |
---|---|---|
committer | Josh Blum | 2011-09-28 22:59:51 -0700 |
commit | b06328b4adee941fe62f12a848cc903097711bdd (patch) | |
tree | fa8b6d5aaadd6bb70786e57891b52a7a17b0b3f6 /gr-digital/swig/CMakeLists.txt | |
parent | 3f7db0afa99caeecb18428d7514dadd380d88d56 (diff) | |
parent | 3e8c3125da6234c4d1f8c0eaf869bc86923cb292 (diff) | |
download | gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.tar.gz gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.tar.bz2 gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.zip |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gr-digital/lib/Makefile.am
gr-digital/python/__init__.py
Diffstat (limited to 'gr-digital/swig/CMakeLists.txt')
-rw-r--r-- | gr-digital/swig/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt index 5c6477aa1..307fba248 100644 --- a/gr-digital/swig/CMakeLists.txt +++ b/gr-digital/swig/CMakeLists.txt @@ -30,7 +30,6 @@ SET(GR_SWIG_INCLUDE_DIRS SET(GR_SWIG_LIBRARIES gnuradio-digital) -GR_SWIG_MAKE(digital_hier digital_hier.i) GR_SWIG_MAKE(digital_swig digital_swig.i) GR_SWIG_INSTALL( @@ -55,6 +54,8 @@ INSTALL( digital_lms_dd_equalizer_cc.i digital_kurtotic_equalizer_cc.i digital_mpsk_receiver_cc.i + digital_gmskmod_bc.i + digital_cpmmod_bc.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "digital_swig" ) |