From ed1fede33d195386a055d2140640ac37707340f1 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Sun, 11 Nov 2012 14:30:45 -0500 Subject: [PATCH] Link to fftw3f library. Added test with swapped dimensions --- CMakeLists.txt | 1 + sample/CMakeLists.txt | 4 ++-- sample/test_fft_calls.cpp | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77bd8b8..f9df817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ include(FindHDF5) include(FindPkgConfig) pkg_check_modules(FFTW3 fftw3>=3.3) +pkg_check_modules(FFTW3F fftw3f>=3.3) pkg_check_modules(EIGEN3 eigen3) include(FindPackageHandleStandardArgs) diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index 816d7bb..9d65cc3 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -44,9 +44,9 @@ target_link_libraries(testAlgo ${tolink}) add_executable(testBSP testBSP.cpp) target_link_libraries(testBSP ${tolink}) -if (FFTW3_FOUND AND EIGEN3_FOUND) +if (FFTW3_FOUND AND FFTW3F_FOUND AND EIGEN3_FOUND) add_executable(test_fft_calls test_fft_calls.cpp) - target_link_libraries(test_fft_calls ${tolink} ${FFTW3_LIBRARIES}) + target_link_libraries(test_fft_calls ${tolink} ${FFTW3_LIBRARIES} ${FFTW3F_LIBRARIES}) endif (FFTW3_FOUND AND EIGEN3_FOUND) if (SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND) diff --git a/sample/test_fft_calls.cpp b/sample/test_fft_calls.cpp index 0009607..4ba1f91 100644 --- a/sample/test_fft_calls.cpp +++ b/sample/test_fft_calls.cpp @@ -51,7 +51,9 @@ int main(int argc, char **argv) { test_2d(128,128); test_2d(131,128); + test_2d(130,128); test_2d(128,128); - test_2d(131,128); + test_2d(128,131); + test_2d(128,130); return 0; }