mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:00:36 +08:00
8e76503a76
* [vtk-m] new port vtk-m * [VTK] Update to 9.0 * include local buildtree changes * [pcl] disable VTK due to API changes in VTK 9.0 * [vtk-m] add supports field to be only x64 * [vtk-dicom] add python executable. * fix vtkm dependency * [vtk-dicom] fix missing std:: namespace * [vtk-m] add uwp to unsupported triplets * [vtk] add pegtl include patch, reenable IOMotionFX * remove hdf5 changes for testing * use different pgetl patch which redirects to the installed config of pegtl * [pegtl-2] version file needs renaming too * [vtk] change dependency to pgetl-2 and fix the patch * [vtk] put in hdf5 fix again and correct manually installed include files * remove deprecated function to retrigger CI * [lz4] correctly lowercase the lz4 config * [vtk] remove unnecessary code * [pegtl-2] add homepage * [pegtl] modernize portfiles * [vtk-dicom] add homepage * [vtk-dicom] modernize portfile * [vtk-m] remove empty build depends * [vtk] try fixing the permission issue * [vtk] minimal dependency correction * [itk] update * fix portfile errors * WIP commit * should make ITK green in VCPKG CI but there a still issues with features * more dependencies and features.... * remove itk from baseline failure so the check can get green * more dependency updating. * minor build fixes * [openjpeg] Fix dll location * fix other issues * add rtkcuda * [openjpeg] remove default features to make arm and uwp platforms happy * [itk] more dependency fixes * [openjpeg] fix no tools case * [itk] fix wip patch * [itk] split up patches & cleanup & and move rtk tools if build * [itk] fix patch and remove old and wip patch * [nifticlib] Add new port required by minc * [nifticlib] change repo and add features * [nifticilib] add zlib dependency & cleanup * [minc] add new port * [vcpkg/scripts] add swig to find acquire programm * [itk/minc] update for external minc * add supports field for nifticlib * [itk] make python a default feature for testing * [itk] cleanup python vars a bit [vcpkg/scripts] correct swig hash * [vcpkg/scripts] fix swig * [itk] fix python include path on unix system * [itk] remove python as a default. A bit of feature cleanup * [itk] update remote RTK * [itk|rtk] remove RTK module before configure to allow patching * [opencl] update opencl wrapper * [itk] fix opencl static linkage * [itk] add cufftw fix * update baseline * [itk] fix itk[tbb] * [itk] update python paths to 3.8 * [itk] add failure messages for unsupported architectures for some features * [vcpkg_find_acquire_program] update swig to 4.0.2 * Update portfile.cmake * [itk] move the module removal out of the if for people reusing the old source tree * [itk] add missing auto_clean to vcpkg_copy_tools * Update ports/nifticlib/CONTROL Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update ports/openjpeg/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update scripts/cmake/vcpkg_find_acquire_program.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [openjpeg] pass OPTIONS to vcpkg_configure_cmake * [itk] fix typo and leave a todo. * use sourceforge args for swig * Update ports/openjpeg/CONTROL Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/opencl/CONTROL Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [itk] remove debug msgs from patch * pre-install yasm on OSX Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 0f47aae05217884193a39690c2beef566f4ed3b1 Mon Sep 17 00:00:00 2001
|
|
From: Stephen Aylward <stephen.aylward@kitware.com>
|
|
Date: Sat, 25 Apr 2020 20:15:21 -0400
|
|
Subject: [PATCH] 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.
|
|
---
|
|
CMake/FindFFTW.cmake | 2 +-
|
|
Modules/Filtering/FFT/CMakeLists.txt | 2 +-
|
|
Modules/Filtering/FFT/src/CMakeLists.txt | 9 +++++----
|
|
3 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/CMake/FindFFTW.cmake b/CMake/FindFFTW.cmake
|
|
index 785edc2b628..e1935899cab 100644
|
|
--- 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
|
|
index 7d9d1900b56..713530149cb 100644
|
|
--- 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
|
|
index 3f3137b8cd4..bde3ee906f8 100644
|
|
--- 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})
|
|
|