diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:23:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:23:30 -0700 |
| commit | 99d24d23e95ea0235a8ea2957c289461625765a3 (patch) | |
| tree | 76f2b684acd54450f2af82215e6a2c0841a82321 /gr-dtv/lib/CMakeLists.txt | |
| parent | e1e912858be7cb6d199fd5ca30c559e6afc48233 (diff) | |
| parent | 0d5fd62c70f5f633b124732a17ed90b061f94941 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-wxgui/lib/CMakeLists.txt
Diffstat (limited to 'gr-dtv/lib/CMakeLists.txt')
| -rw-r--r-- | gr-dtv/lib/CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt index f051e0bdf2..9efbd7f9b0 100644 --- a/gr-dtv/lib/CMakeLists.txt +++ b/gr-dtv/lib/CMakeLists.txt @@ -100,11 +100,6 @@ list(APPEND dtv_sources catv/catv_trellis_enc_bb_impl.cc ) -if(ENABLE_GR_CTRLPORT) -list(APPEND dtv_sources -) -endif(ENABLE_GR_CTRLPORT) - list(APPEND dtv_libs gnuradio-runtime gnuradio-analog |