diff options
| author | Tom Rondeau | 2012-07-19 19:27:15 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-07-19 19:27:58 -0400 |
| commit | 267ac52b5b3297816bab8454ec60cd927fcc3182 (patch) | |
| tree | 6bc1d7881bf793f68ca2e5489cfeda1d40fb1eb6 /gr-filter | |
| parent | 494b13ab6e5b342e03e3e3202dea9c3a85ff46e1 (diff) | |
| download | gnuradio-267ac52b5b3297816bab8454ec60cd927fcc3182.tar.gz gnuradio-267ac52b5b3297816bab8454ec60cd927fcc3182.tar.bz2 gnuradio-267ac52b5b3297816bab8454ec60cd927fcc3182.zip | |
filter: fixing cppunit test QA to work properly with testing disabled.
Diffstat (limited to 'gr-filter')
| -rw-r--r-- | gr-filter/lib/CMakeLists.txt | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index 73d7d7bae..532bd1992 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -98,7 +98,6 @@ include_directories( ${GR_FFT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} - ${CPPUNIT_INCLUDE_DIRS} ) link_directories(${FFT_LIBRARY_DIRS}) @@ -157,22 +156,30 @@ add_dependencies(gnuradio-filter gnuradio-fft filter_generated_includes filter_g ######################################################################## # QA C++ Code for gr-filter ######################################################################## -list(APPEND test_gr_filter_sources +if(ENABLE_TESTING) + include(GrTest) + + include_directories(${CPPUNIT_INCLUDE_DIRS}) + link_directories(${CPPUNIT_LIBRARY_DIRS}) + + list(APPEND test_gr_filter_sources ${CMAKE_CURRENT_SOURCE_DIR}/test_gr_filter.cc ${CMAKE_CURRENT_SOURCE_DIR}/qa_filter.cc ${CMAKE_CURRENT_SOURCE_DIR}/qa_firdes.cc ${CMAKE_CURRENT_SOURCE_DIR}/qa_fir_filter_with_buffer.cc ${CMAKE_CURRENT_SOURCE_DIR}/qa_mmse_fir_interpolator_cc.cc ${CMAKE_CURRENT_SOURCE_DIR}/qa_mmse_fir_interpolator_ff.cc -) + ) -add_executable(test-gr-filter ${test_gr_filter_sources}) -target_link_libraries( - test-gr-filter - gnuradio-core - gnuradio-filter - ${CPPUNIT_LIBRARIES} - ${Boost_LIBRARIES} -) + add_executable(test-gr-filter ${test_gr_filter_sources}) + + target_link_libraries( + test-gr-filter + gnuradio-core + gnuradio-filter + ${Boost_LIBRARIES} + ${CPPUNIT_LIBRARIES} + ) -GR_ADD_TEST(test_gr_filter test-gr-filter) + GR_ADD_TEST(test_gr_filter test-gr-filter) +endif(ENABLE_TESTING) |