BUG: CUFFTW paths were not being set and unnecessary FFTW files used

FindFFTW sets the FFTW_INCLUDES variable. The FFTW_INCLUDE_PATH var is specific to FFTW (not used by CUFFTW). FFTWGlobalConfiguration file is only needed if FFTW is being used, not if CUFFT is being used.
InsightSoftwareConsortium · May 14, 2020 · 449c571 · 449c571
1 parent 355c6cb
commit 449c571
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CMake/FindFFTW.cmake b/CMake/FindFFTW.cmake
@@ -62,7 +62,7 @@ if(ITK_USE_FFTWD OR ITK_USE_FFTWF)
     find_path(FFTW_INCLUDE_PATH fftw3.h ${FFTW_INC_SEARCHPATH})
   endif()
 
-  if(FFTW_INCLUDE_PATH)
+  if(FFTW_INCLUDE_PATH OR CUFFTW_INCLUDE_PATH)
     if(ITK_USE_CUFFTW)
       file(TO_CMAKE_PATH "${CUFFTW_INCLUDE_PATH}" CUFFTW_INCLUDE_PATH)
       set(FFTW_INCLUDE ${CUFFTW_INCLUDE_PATH})

diff --git a/Modules/Filtering/FFT/CMakeLists.txt b/Modules/Filtering/FFT/CMakeLists.txt
@@ -5,5 +5,5 @@ if(ITK_USE_CUFFTW)
 else()
   set(ITKFFT_LIBRARIES ITKFFT)
 endif()
-set(ITKFFT_INCLUDE_DIRS ${FFTW_INCLUDE_PATH})
+set(ITKFFT_INCLUDE_DIRS ${FFTW_INCLUDE})
 itk_module_impl()
diff --git a/Modules/Filtering/FFT/src/CMakeLists.txt b/Modules/Filtering/FFT/src/CMakeLists.txt
@@ -1,7 +1,8 @@
-set(ITKFFT_SRCS
-  itkFFTWGlobalConfiguration.cxx
-  itkComplexToComplexFFTImageFilter.cxx
-  )
+set(ITKFFT_SRCS itkComplexToComplexFFTImageFilter.cxx)
+
+if( ITK_USE_FFTWF OR ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW)
+  list(APPEND ITKFFT_SRCS itkFFTWGlobalConfiguration.cxx )
+endif()
 
 itk_module_add_library(ITKFFT ${ITKFFT_SRCS})