mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 04:36:47 +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>
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
diff --git a/CMake/ITKModuleMacros.cmake b/CMake/ITKModuleMacros.cmake
|
|
index da9f3a902..60420bb0a 100644
|
|
--- a/CMake/ITKModuleMacros.cmake
|
|
+++ b/CMake/ITKModuleMacros.cmake
|
|
@@ -162,9 +162,6 @@ macro(itk_module_impl)
|
|
foreach(dep IN LISTS ITK_MODULE_${itk-module}_DEPENDS)
|
|
list(APPEND ${itk-module}_LIBRARIES "${${dep}_LIBRARIES}")
|
|
endforeach()
|
|
- if(${itk-module}_LIBRARIES)
|
|
- list(REMOVE_DUPLICATES ${itk-module}_LIBRARIES)
|
|
- endif()
|
|
endif()
|
|
|
|
if(EXISTS ${${itk-module}_SOURCE_DIR}/include)
|
|
diff --git a/CMake/ITKModuleAPI.cmake b/CMake/ITKModuleAPI.cmake
|
|
index af64d96dc..809335e6d 100644
|
|
--- a/CMake/ITKModuleAPI.cmake
|
|
+++ b/CMake/ITKModuleAPI.cmake
|
|
@@ -133,7 +133,7 @@ macro(itk_module_config ns)
|
|
endforeach()
|
|
unset(_${ns}_USED_MODULES)
|
|
|
|
- foreach(v ${ns}_LIBRARIES ${ns}_INCLUDE_DIRS ${ns}_LIBRARY_DIRS
|
|
+ foreach(v ${ns}_INCLUDE_DIRS ${ns}_LIBRARY_DIRS
|
|
${ns}_RUNTIME_LIBRARY_DIRS ${ns}_FACTORY_NAMES ${ns}_FACTORY_LIST)
|
|
if(${v})
|
|
list(REMOVE_DUPLICATES ${v})
|