aboutsummaryrefslogtreecommitdiff
path: root/ports/itk
diff options
context:
space:
mode:
Diffstat (limited to 'ports/itk')
-rw-r--r--ports/itk/CONTROL2
-rw-r--r--ports/itk/expat.patch54
-rw-r--r--ports/itk/portfile.cmake1
3 files changed, 1 insertions, 56 deletions
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL
index e0dabeeb1..94135373e 100644
--- a/ports/itk/CONTROL
+++ b/ports/itk/CONTROL
@@ -1,6 +1,6 @@
Source: itk
Version: 5.1.0
-Port-Version: 1
+Port-Version: 2
Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
Homepage: https://github.com/InsightSoftwareConsortium/ITK
Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[core,cpp], openjpeg[core], fftw3[core], gtest, gdcm, icu, minc
diff --git a/ports/itk/expat.patch b/ports/itk/expat.patch
deleted file mode 100644
index 44ef3a381..000000000
--- a/ports/itk/expat.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Modules/IO/GDCM/itk-module.cmake b/Modules/IO/GDCM/itk-module.cmake
-index 2703612..51f0214 100644
---- a/Modules/IO/GDCM/itk-module.cmake
-+++ b/Modules/IO/GDCM/itk-module.cmake
-@@ -1,7 +1,7 @@
- set(DOCUMENTATION "This module contains ITK ImageIO classes for the <a
- href=\"http://sourceforge.net/projects/gdcm/\">Grassroots DICOM (GDCM)</a> based
- readers and writers of the medical imaging DICOM standard.")
--
-+find_package(expat CONFIG REQUIRED)
- itk_module(ITKIOGDCM
- ENABLE_SHARED
- DEPENDS
-@@ -9,6 +9,7 @@ itk_module(ITKIOGDCM
- ITKIOImageBase
- PRIVATE_DEPENDS
- ITKGDCM
-+ ITKExpat
- TEST_DEPENDS
- ITKTestKernel
- ITKGDCM
-diff --git a/Modules/ThirdParty/Expat/CMakeLists.txt b/Modules/ThirdParty/Expat/CMakeLists.txt
-index f69709d..9b49323 100644
---- a/Modules/ThirdParty/Expat/CMakeLists.txt
-+++ b/Modules/ThirdParty/Expat/CMakeLists.txt
-@@ -5,10 +5,12 @@ option(ITK_USE_SYSTEM_EXPAT "Use system-installed expat" ${ITK_USE_SYSTEM_LIBRAR
- mark_as_advanced(ITK_USE_SYSTEM_EXPAT)
-
- if(ITK_USE_SYSTEM_EXPAT)
-- find_package(EXPAT REQUIRED)
-- set(ITKExpat_INCLUDE_DIRS ${ITKExpat_BINARY_DIR}/src )
-- set(ITKExpat_SYSTEM_INCLUDE_DIRS "${EXPAT_INCLUDE_DIR}")
-- set(ITKExpat_LIBRARIES "${EXPAT_LIBRARY}")
-+ find_package(expat CONFIG REQUIRED)
-+ if(WIN32 AND NOT MINGW)
-+ set(ITKExpat_LIBRARIES expat::libexpat)
-+ else()
-+ set(ITKExpat_LIBRARIES expat::expat)
-+ endif()
- set(ITKExpat_NO_SRC 1)
- else()
- set(ITKExpat_INCLUDE_DIRS
-diff --git a/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt b/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt
-index 3f83225..c7ddbbe 100644
---- a/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt
-+++ b/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt
-@@ -11,6 +11,7 @@ set(GIFTI_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/gifti")
-
- if("${ITK_VERSION_MAJOR}" GREATER 0.0)
- # ITK provides expat and zlib.
-+ find_package(expat CONFIG REQUIRED)
- include_directories(${ITKNIFTI_INCLUDE_DIRS})
- set(PACKAGE_PREFIX "ITK")
- set(EXPAT_LIBRARIES ${ITKExpat_LIBRARIES})
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake
index 622a25189..b16ba194a 100644
--- a/ports/itk/portfile.cmake
+++ b/ports/itk/portfile.cmake
@@ -16,7 +16,6 @@ vcpkg_from_github(
python_gpu_wrapping.patch
opencl.patch
cufftw.patch
- expat.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS