1 files changed, 109 insertions, 2 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 20e3ae4aa6..57c1cd20df 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright 2012-2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -95,17 +95,28 @@ expand_cc_h_impl(add_const_XX       ss ii ff cc)
 expand_cc_h_impl(add_const_vXX      ss ii ff cc)
 expand_cc_h_impl(and_XX             bb ss ii)
 expand_cc_h_impl(and_const_XX       bb ss ii)
+expand_cc_h_impl(argmax_XX          fs is ss)
 expand_cc_h_impl(divide_XX          ss ii ff cc)
 expand_cc_h_impl(integrate_XX       ss ii ff cc)
+expand_cc_h_impl(max_XX             ff ii ss)
+expand_cc_h_impl(moving_average_XX  ss ii ff cc)
 expand_cc_h_impl(multiply_XX        ss ii)
 expand_cc_h_impl(multiply_const_XX  ss ii)
 expand_cc_h_impl(multiply_const_vXX ss ii ff cc)
+expand_cc_h_impl(mute_XX            ss ii ff cc)
 expand_cc_h_impl(not_XX             bb ss ii)
 expand_cc_h_impl(or_XX              bb ss ii)
+expand_cc_h_impl(peak_detector_XX   fb ib sb)
+expand_cc_h_impl(probe_signal_X     b s i f c)
+expand_cc_h_impl(probe_signal_vX    b s i f c)
+expand_cc_h_impl(sample_and_hold_XX bb ss ii ff)
 expand_cc_h_impl(sub_XX             ss ii ff cc)
 expand_cc_h_impl(xor_XX             bb ss ii)
 expand_cc_h_impl(packed_to_unpacked_XX bb ss ii)
 expand_cc_h_impl(unpacked_to_packed_XX bb ss ii)
+expand_cc_h_impl(vector_insert_X    b s i f c)
+expand_cc_h_impl(vector_sink_X      b s i f c)
+expand_cc_h_impl(vector_source_X    b s i f c)
 
 ########################################################################
 # Setup the include and linker paths
@@ -128,10 +139,19 @@ link_directories(${Boost_LIBRARY_DIRS})
 ########################################################################
 list(APPEND gr_blocks_sources
     ${generated_sources}
+    control_loop.cc
     count_bits.cc
+    file_sink_base.cc
+    wavfile.cc
     add_ff_impl.cc
+    annotator_1to1_impl.cc
+    annotator_alltoall_impl.cc
+    annotator_raw_impl.cc
+    bin_statistics_f_impl.cc
+    burst_tagger_impl.cc
     char_to_float_impl.cc
     char_to_short_impl.cc
+    check_lfsr_32k_s_impl.cc
     complex_to_interleaved_short_impl.cc
     complex_to_float_impl.cc
     complex_to_real_impl.cc
@@ -140,8 +160,13 @@ list(APPEND gr_blocks_sources
     complex_to_mag_squared_impl.cc
     complex_to_arg_impl.cc
     conjugate_cc_impl.cc
+    copy_impl.cc
     deinterleave_impl.cc
     delay_impl.cc
+    endian_swap_impl.cc
+    file_descriptor_sink_impl.cc
+    file_descriptor_source_impl.cc
+    file_sink_impl.cc
     file_source_impl.cc
     file_meta_sink_impl.cc
     file_meta_source_impl.cc
@@ -152,50 +177,132 @@ list(APPEND gr_blocks_sources
     float_to_short_impl.cc
     float_array_to_uchar.cc
     float_to_uchar_impl.cc
+    head_impl.cc
     int_to_float_impl.cc
     interleave_impl.cc
     interleaved_short_array_to_complex.cc
     interleaved_short_to_complex_impl.cc
     keep_m_in_n_impl.cc
     keep_one_in_n_impl.cc
+    lfsr_32k_source_s_impl.cc
+    message_debug_impl.cc
+    message_sink_impl.cc
+    message_source_impl.cc
+    message_strobe_impl.cc
+    message_burst_source_impl.cc
     multiply_cc_impl.cc
     multiply_ff_impl.cc
     multiply_conjugate_cc_impl.cc
     multiply_const_cc_impl.cc
     multiply_const_ff_impl.cc
     nlog10_ff_impl.cc
+    nop_impl.cc
+    null_sink_impl.cc
+    null_source_impl.cc
+    pack_k_bits_bb_impl.cc
     patterned_interleaver_impl.cc
+    pdu.cc
+    tag_debug_impl.cc
+    pdu_to_tagged_stream_impl.cc
     peak_detector2_fb_impl.cc
+    plateau_detector_fb_impl.cc
+    probe_rate_impl.cc
     regenerate_bb_impl.cc
+    repack_bits_bb_impl.cc
     repeat_impl.cc
     rms_cf_impl.cc
     rms_ff_impl.cc
     short_to_char_impl.cc
     short_to_float_impl.cc
+    skiphead_impl.cc
+    socket_pdu_impl.cc
     stream_mux_impl.cc
+    stream_pdu_base.cc
     stream_to_streams_impl.cc
     stream_to_vector_impl.cc
     streams_to_stream_impl.cc
     streams_to_vector_impl.cc
     stretch_ff_impl.cc
+    tagged_file_sink_impl.cc
+    tagged_stream_to_pdu_impl.cc
     threshold_ff_impl.cc
     throttle_impl.cc
     transcendental_impl.cc
+    tcp_connection.cc
+    tuntap_pdu_impl.cc
+    tagged_stream_mux_impl.cc
     uchar_array_to_float.cc
     uchar_to_float_impl.cc
+    udp_sink_impl.cc
+    udp_source_impl.cc
+    unpack_k_bits_bb_impl.cc
+    vco_f_impl.cc
+    vector_map_impl.cc
     vector_to_stream_impl.cc
     vector_to_streams_impl.cc
+    wavfile_sink_impl.cc
+    wavfile_source_impl.cc
 )
 
+#Add Windows DLL resource file if using MSVC
+IF(MSVC)
+    include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake)
+
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-blocks.rc.in
+        ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-blocks.rc
+    @ONLY)
+
+    list(APPEND gr_blocks_sources
+        ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-blocks.rc
+    )
+ENDIF(MSVC)
+
 list(APPEND blocks_libs
     gnuradio-core
     volk
     ${Boost_LIBRARIES}
     ${BLOCKS_LIBRARIES}
+    ${LOG4CPP_LIBRARIES}
 )
 
-add_library(gnuradio-blocks SHARED ${gr_blocks_sources})
+add_library(gnuradio-blocks SHARED ${gr_blocks_sources}
+    tag_gate_impl.cc)
 add_dependencies(gnuradio-blocks blocks_generated_includes)
 
 target_link_libraries(gnuradio-blocks ${blocks_libs})
 GR_LIBRARY_FOO(gnuradio-blocks RUNTIME_COMPONENT "blocks_runtime" DEVEL_COMPONENT "blocks_devel")
+
+########################################################################
+# QA C++ Code for gr-filter
+########################################################################
+if(ENABLE_TESTING)
+  include(GrTest)
+
+  include_directories(
+    ${GR_FILTER_INCLUDE_DIRS}
+    ${CPPUNIT_INCLUDE_DIRS})
+  link_directories(${CPPUNIT_LIBRARY_DIRS})
+
+  list(APPEND test_gr_blocks_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_gr_blocks.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_blocks.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_block_tags.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_rotator.cc
+    )
+
+  add_executable(test-gr-blocks ${test_gr_blocks_sources})
+
+  list(APPEND GR_TEST_TARGET_DEPS test-gr-blocks gnuradio-blocks)
+
+  target_link_libraries(
+    test-gr-blocks
+    gnuradio-core
+    gnuradio-blocks
+    gnuradio-filter
+    ${Boost_LIBRARIES}
+    ${CPPUNIT_LIBRARIES}
+  )
+
+  GR_ADD_TEST(test_gr_blocks test-gr-blocks)
+endif(ENABLE_TESTING)