Fixup

microsoft · Oct 20, 2024 · 36d1a4b · 36d1a4b
1 parent f9def35
commit 36d1a4b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 deletions.
diff --git a/ports/itk/cufftw.diff b/ports/itk/cufftw.diff
@@ -0,0 +1,26 @@
+diff --git a/Modules/Filtering/FFT/CMakeLists.txt b/Modules/Filtering/FFT/CMakeLists.txt
+index 3f87969..1b296ed 100644
+--- a/Modules/Filtering/FFT/CMakeLists.txt
++++ b/Modules/Filtering/FFT/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ project(ITKFFT)
+
+-if(ITK_USE_CUFFTW)
++if(0)
+   set(ITKFFT_LIBRARIES ITKFFT ${FFTWF_LIBRARIES})
+ else()
+   set(ITKFFT_LIBRARIES ITKFFT)
+diff --git a/Modules/Filtering/FFT/src/CMakeLists.txt b/Modules/Filtering/FFT/src/CMakeLists.txt
+index 83b176c..b51bc48 100644
+--- a/Modules/Filtering/FFT/src/CMakeLists.txt
++++ b/Modules/Filtering/FFT/src/CMakeLists.txt
+@@ -10,6 +10,9 @@ endif()
+ itk_module_add_library(ITKFFT ${ITKFFT_SRCS})
+
+ # this library is only needed if FFTW is used
++if(ITK_USE_CUFFTW)
++  target_link_libraries(ITKFFT LINK_PUBLIC CUDA::cufftw)
++endif()
+ if(ITK_USE_FFTWF
+    OR ITK_USE_FFTWD
+    AND NOT ITK_USE_CUFFTW)
diff --git a/ports/itk/fftw.diff → ports/itk/find-fftw.diff b/ports/itk/fftw.diff → ports/itk/find-fftw.diff
@@ -58,16 +58,3 @@ index 7a77ae3..3e41f37 100644
  endif()
 
  # Add configuration with GPU
-diff --git a/Modules/Filtering/FFT/CMakeLists.txt b/Modules/Filtering/FFT/CMakeLists.txt
-index 3f87969..aa4db40 100644
---- a/Modules/Filtering/FFT/CMakeLists.txt
-+++ b/Modules/Filtering/FFT/CMakeLists.txt
-@@ -1,7 +1,7 @@
- project(ITKFFT)
-
- if(ITK_USE_CUFFTW)
--  set(ITKFFT_LIBRARIES ITKFFT ${FFTWF_LIBRARIES})
-+  set(ITKFFT_PUBLIC_DEPENDS ITKFFT ${FFTWF_LIBRARIES})
- else()
-   set(ITKFFT_LIBRARIES ITKFFT)
- endif()
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake
@@ -16,8 +16,9 @@ vcpkg_from_github(
     #]]
     HEAD_REF master
     PATCHES
+        cuda.diff
         double-conversion.patch
-        fftw.diff
+        find-fftw.diff
         openjpeg.patch
         openjpeg2.patch
         var_libraries.patch
@@ -262,4 +263,3 @@ if("rtk" IN_LIST FEATURES)
     )
 endif()
 vcpkg_install_copyright(FILE_LIST ${file_list})
-message(FATAL_ERROR STOP)
diff --git a/versions/i-/itk.json b/versions/i-/itk.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "dee4cb241631124dd93f36c779a0fc8b26210ad5",
+      "git-tree": "6a4994396ab935aa87b8305dc20a41da953fa70a",
       "version": "5.4.0",
       "port-version": 1
     },