diff options
author | Andrej Rode <mail@andrejro.de> | 2018-06-23 23:41:42 +0200 |
---|---|---|
committer | Andrej Rode <mail@andrejro.de> | 2018-06-24 00:03:35 +0200 |
commit | 167a6152bad060fc53dd29e0fa79ef83eff1be5b (patch) | |
tree | a01049672d9d7d1bf3d295ed96698a323941f8e8 /gr-dtv/grc/CMakeLists.txt | |
parent | 3c8e6008b092287246234001db7cf1a4038300da (diff) | |
parent | fcd002b6ac82e1e0c1224e24506410ff0833e1aa (diff) |
Merge branch 'python3_fix' into next
Manual merge conflict resolution has been applied to following
conflicts:
* Typos:
* gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
* gr-blocks/python/blocks/qa_wavfile.py
* gr-filter/examples/gr_filtdes_api.py
* grc/blocks/parameter.xml
* gr-uhd/python/uhd/__init__.py
* ValueError -> RuntimeError:
* gr-blocks/python/blocks/qa_hier_block2.py
* relative Imports & other Py3k:
* gr-digital/python/digital/psk_constellations.py
* gr-digital/python/digital/qam_constellations.py
* gr-digital/python/digital/test_soft_decisions.py
* gr-digital/python/digital/gfsk.py
* SequenceCompleter:
* gr-utils/python/modtool/modtool_add.py
* gr-utils/python/modtool/modtool_rename.py
* gr-utils/python/modtool/modtool_rm.py
* Updated API on next:
* gr-blocks/grc/blocks_file_source.xml
* gr-blocks/python/blocks/qa_file_source_sink.py
* gr-qtgui/grc/qtgui_time_sink_x.xml
* GRC Py3k Updates:
* grc/core/Block.py
* grc/core/Constants.py
* grc/core/Platform.py
* grc/core/utils/odict.py
* grc/gui/Actions.py
* grc/gui/Block.py
* grc/gui/Executor.py
* grc/gui/Port.py
Diffstat (limited to 'gr-dtv/grc/CMakeLists.txt')
-rw-r--r-- | gr-dtv/grc/CMakeLists.txt | 109 |
1 files changed, 54 insertions, 55 deletions
diff --git a/gr-dtv/grc/CMakeLists.txt b/gr-dtv/grc/CMakeLists.txt index e226d09976..3ed47f2311 100644 --- a/gr-dtv/grc/CMakeLists.txt +++ b/gr-dtv/grc/CMakeLists.txt @@ -18,60 +18,59 @@ # Boston, MA 02110-1301, USA. install(FILES - dtv_atsc_deinterleaver.xml - dtv_atsc_depad.xml - dtv_atsc_derandomizer.xml - dtv_atsc_equalizer.xml - dtv_atsc_fpll.xml - dtv_atsc_fs_checker.xml - dtv_atsc_rs_decoder.xml - dtv_atsc_rx.xml - dtv_atsc_rx_filter.xml - dtv_atsc_sync.xml - dtv_atsc_viterbi_decoder.xml - dtv_block_tree.xml - dtv_atsc_pad.xml - dtv_atsc_randomizer.xml - dtv_atsc_rs_encoder.xml - dtv_atsc_interleaver.xml - dtv_atsc_trellis_encoder.xml - dtv_atsc_field_sync_mux.xml - dtv_dvb_bbheader_bb.xml - dtv_dvb_bbscrambler_bb.xml - dtv_dvb_bch_bb.xml - dtv_dvb_ldpc_bb.xml - dtv_dvbt2_interleaver_bb.xml - dtv_dvbt2_modulator_bc.xml - dtv_dvbt2_cellinterleaver_cc.xml - dtv_dvbt2_framemapper_cc.xml - dtv_dvbt2_freqinterleaver_cc.xml - dtv_dvbt2_pilotgenerator_cc.xml - dtv_dvbt2_paprtr_cc.xml - dtv_dvbt2_p1insertion_cc.xml - dtv_dvbt2_miso_cc.xml - dtv_dvbs2_interleaver_bb.xml - dtv_dvbs2_modulator_bc.xml - dtv_dvbs2_physical_cc.xml - dtv_dvbt_energy_dispersal.xml - dtv_dvbt_reed_solomon_enc.xml - dtv_dvbt_convolutional_interleaver.xml - dtv_dvbt_inner_coder.xml - dtv_dvbt_bit_inner_interleaver.xml - dtv_dvbt_symbol_inner_interleaver.xml - dtv_dvbt_map.xml - dtv_dvbt_reference_signals.xml - dtv_dvbt_ofdm_sym_acquisition.xml - dtv_dvbt_demod_reference_signals.xml - dtv_dvbt_demap.xml - dtv_dvbt_bit_inner_deinterleaver.xml - dtv_dvbt_viterbi_decoder.xml - dtv_dvbt_convolutional_deinterleaver.xml - dtv_dvbt_reed_solomon_dec.xml - dtv_dvbt_energy_descramble.xml - dtv_catv_transport_framing_enc_bb.xml - dtv_catv_reed_solomon_enc_bb.xml - dtv_catv_randomizer_bb.xml - dtv_catv_frame_sync_enc_bb.xml - dtv_catv_trellis_enc_bb.xml + dtv_atsc_deinterleaver.block.yml + dtv_atsc_depad.block.yml + dtv_atsc_derandomizer.block.yml + dtv_atsc_equalizer.block.yml + dtv_atsc_fpll.block.yml + dtv_atsc_fs_checker.block.yml + dtv_atsc_rs_decoder.block.yml + dtv_atsc_rx.block.yml + dtv_atsc_rx_filter.block.yml + dtv_atsc_sync.block.yml + dtv_atsc_viterbi_decoder.block.yml + dtv_atsc_pad.block.yml + dtv_atsc_randomizer.block.yml + dtv_atsc_rs_encoder.block.yml + dtv_atsc_interleaver.block.yml + dtv_atsc_trellis_encoder.block.yml + dtv_atsc_field_sync_mux.block.yml + dtv_dvb_bbheader_bb.block.yml + dtv_dvb_bbscrambler_bb.block.yml + dtv_dvb_bch_bb.block.yml + dtv_dvb_ldpc_bb.block.yml + dtv_dvbt2_interleaver_bb.block.yml + dtv_dvbt2_modulator_bc.block.yml + dtv_dvbt2_cellinterleaver_cc.block.yml + dtv_dvbt2_framemapper_cc.block.yml + dtv_dvbt2_freqinterleaver_cc.block.yml + dtv_dvbt2_pilotgenerator_cc.block.yml + dtv_dvbt2_paprtr_cc.block.yml + dtv_dvbt2_p1insertion_cc.block.yml + dtv_dvbt2_miso_cc.block.yml + dtv_dvbs2_interleaver_bb.block.yml + dtv_dvbs2_modulator_bc.block.yml + dtv_dvbs2_physical_cc.block.yml + dtv_dvbt_energy_dispersal.block.yml + dtv_dvbt_reed_solomon_enc.block.yml + dtv_dvbt_convolutional_interleaver.block.yml + dtv_dvbt_inner_coder.block.yml + dtv_dvbt_bit_inner_interleaver.block.yml + dtv_dvbt_symbol_inner_interleaver.block.yml + dtv_dvbt_map.block.yml + dtv_dvbt_reference_signals.block.yml + dtv_dvbt_ofdm_sym_acquisition.block.yml + dtv_dvbt_demod_reference_signals.block.yml + dtv_dvbt_demap.block.yml + dtv_dvbt_bit_inner_deinterleaver.block.yml + dtv_dvbt_viterbi_decoder.block.yml + dtv_dvbt_convolutional_deinterleaver.block.yml + dtv_dvbt_reed_solomon_dec.block.yml + dtv_dvbt_energy_descramble.block.yml + dtv_catv_transport_framing_enc_bb.block.yml + dtv_catv_reed_solomon_enc_bb.block.yml + dtv_catv_randomizer_bb.block.yml + dtv_catv_frame_sync_enc_bb.block.yml + dtv_catv_trellis_enc_bb.block.yml DESTINATION ${GRC_BLOCKS_DIR} ) |