diff options
| author | Johnathan Corgan | 2012-11-14 09:34:01 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-11-14 09:34:01 -0800 |
| commit | 0ffb07f4f1763ae6f5cc9cb2910ba20241e84bca (patch) | |
| tree | a85e79f623be99e709906cefc20e09020c7a19f5 /gr-fft | |
| parent | 973a21382f2bb64ebe426886a01a67d62816e54c (diff) | |
| parent | 64913ee414f2c8a51afb2277b16b957fa2e7e066 (diff) | |
| download | gnuradio-0ffb07f4f1763ae6f5cc9cb2910ba20241e84bca.tar.gz gnuradio-0ffb07f4f1763ae6f5cc9cb2910ba20241e84bca.tar.bz2 gnuradio-0ffb07f4f1763ae6f5cc9cb2910ba20241e84bca.zip | |
Merge branch 'maint'
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/lib/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | gr-fft/python/CMakeLists.txt | 14 |
2 files changed, 12 insertions, 9 deletions
diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index ea1248fba..c16e0d116 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -29,7 +29,6 @@ include_directories( ${FFTW3F_INCLUDE_DIRS} ) -link_directories(${FFT_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) link_directories(${FFTW3F_LIBRARY_DIRS}) @@ -47,10 +46,14 @@ list(APPEND fft_sources list(APPEND fft_libs gnuradio-core ${Boost_LIBRARIES} - ${FFT_LIBRARIES} ${FFTW3F_LIBRARIES} ) +if(FFTW3F_THREADS_LIBRARIES) + list(APPEND fft_libs ${FFTW3F_THREADS_LIBRARIES}) + add_definitions("-DFFTW3F_THREADS") +endif() + add_library(gnuradio-fft SHARED ${fft_sources}) target_link_libraries(gnuradio-fft ${fft_libs}) GR_LIBRARY_FOO(gnuradio-fft RUNTIME_COMPONENT "fft_runtime" DEVEL_COMPONENT "fft_devel") diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/CMakeLists.txt index c64df4659..3b328780f 100644 --- a/gr-fft/python/CMakeLists.txt +++ b/gr-fft/python/CMakeLists.txt @@ -31,17 +31,17 @@ GR_PYTHON_INSTALL( # Handle the unit tests ######################################################################## if(ENABLE_TESTING) + +list(APPEND GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gr-fft/python + ${CMAKE_BINARY_DIR}/gr-fft/swig +) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-fft) + include(GrTest) file(GLOB py_qa_test_files "qa_*.py") foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) - set(GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gnuradio-core/src/python - ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig - ${CMAKE_BINARY_DIR}/gr-fft/python - ${CMAKE_BINARY_DIR}/gr-fft/swig - ) - set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-fft) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) |