diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-14 10:07:45 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-14 10:07:45 -0800 |
| commit | 8e01e6f004fe9039cb833250231192438c982c0a (patch) | |
| tree | 0e16a1983a52ee4b06d4e17d1fcf617d954cce9d /gr-fft/lib | |
| parent | 01abe9f225dd73e6feae151e42c285dd3c880d54 (diff) | |
| parent | 315237fd3935f31a0920613af3947189520f796a (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/src/lib/CMakeLists.txt
gr-digital/python/CMakeLists.txt
gr-trellis/src/python/CMakeLists.txt
gr-vocoder/python/CMakeLists.txt
gr-wavelet/python/CMakeLists.txt
Diffstat (limited to 'gr-fft/lib')
| -rw-r--r-- | gr-fft/lib/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index ea1248fbac..c16e0d1164 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") |