diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
| commit | 254fe5e89403d4de1fa6663d09efdf946996aff3 (patch) | |
| tree | 62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gr-digital/lib/CMakeLists.txt | |
| parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
| parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) | |
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gr-digital/lib/CMakeLists.txt')
| -rw-r--r-- | gr-digital/lib/CMakeLists.txt | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index b6754d1ce9..e19491a557 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -39,19 +39,13 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) ######################################################################## -# Invoke macro to generate various sources -######################################################################## -include(GrMiscUtils) -GR_EXPAND_X_CC_H(digital chunks_to_symbols_XX_impl bf bc sf sc if ic) -GR_EXPAND_X_CC_H(digital burst_shaper_XX_impl cc ff) - -######################################################################## # Setup library ######################################################################## list(APPEND digital_sources - ${generated_sources} additive_scrambler_bb_impl.cc binary_slicer_fb_impl.cc + burst_shaper_impl.cc + chunks_to_symbols_impl.cc clock_recovery_mm_cc_impl.cc clock_recovery_mm_ff_impl.cc clock_tracking_loop.cc @@ -66,7 +60,6 @@ list(APPEND digital_sources correlate_access_code_tag_ff_impl.cc correlate_access_code_bb_ts_impl.cc correlate_access_code_ff_ts_impl.cc - correlate_and_sync_cc_impl.cc costas_loop_cc_impl.cc cpmmod_bc_impl.cc crc32.cc @@ -89,7 +82,6 @@ list(APPEND digital_sources lms_dd_equalizer_cc_impl.cc map_bb_impl.cc modulate_vector.cc - mpsk_receiver_cc_impl.cc mpsk_snr_est.cc mpsk_snr_est_cc_impl.cc msk_timing_recovery_cc_impl.cc @@ -99,12 +91,7 @@ list(APPEND digital_sources ofdm_equalizer_base.cc ofdm_equalizer_simpledfe.cc ofdm_equalizer_static.cc - ofdm_frame_acquisition_impl.cc ofdm_frame_equalizer_vcvc_impl.cc - ofdm_frame_sink_impl.cc - ofdm_insert_preamble_impl.cc - ofdm_mapper_bcv_impl.cc - ofdm_sampler_impl.cc ofdm_serializer_vcc_impl.cc ofdm_sync_sc_cfb_impl.cc header_format_base.cc @@ -159,11 +146,10 @@ list(APPEND digital_libs add_library(gnuradio-digital SHARED ${digital_sources}) target_link_libraries(gnuradio-digital ${digital_libs}) -GR_LIBRARY_FOO(gnuradio-digital RUNTIME_COMPONENT "digital_runtime" DEVEL_COMPONENT "digital_devel") +GR_LIBRARY_FOO(gnuradio-digital) add_dependencies( gnuradio-digital - digital_generated_includes digital_generated_swigs gnuradio-runtime gnuradio-filter @@ -186,7 +172,6 @@ if(ENABLE_STATIC_LIBS) add_library(gnuradio-digital_static STATIC ${digital_sources}) add_dependencies(gnuradio-digital_static - digital_generated_includes gnuradio-runtime_static gnuradio-filter_static gnuradio-analog_static @@ -198,7 +183,7 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-digital_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "digital_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) |