5 files changed, 41 insertions, 50 deletions
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL
index b8ba70d0f..282ac4b3c 100644
--- a/ports/itk/CONTROL
+++ b/ports/itk/CONTROL
@@ -1,5 +1,5 @@
 Source: itk
-Version: 5.0.0-1
+Version: 5.0.1-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[cpp], openjpeg
diff --git a/ports/itk/fix_conflict_with_openjp2_pc.patch b/ports/itk/fix_conflict_with_openjp2_pc.patch
deleted file mode 100644
index b1a2fb6ec..000000000
--- a/ports/itk/fix_conflict_with_openjp2_pc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
-index 6ac16ab6..2bde9952 100644
---- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
-+++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
-@@ -373,7 +373,8 @@ else()
- endif()
- 
- if(GDCM_USE_SYSTEM_OPENJPEG)
--  find_package(OpenJPEG 2.0.0 REQUIRED)
-+  # openjpeg version in vcpkg is already greater than 2.0.0 and openjpeg has no version.cmake file
-+  find_package(OpenJPEG REQUIRED)
-   set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
- else()
-   set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)
-diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
-index 565cc338..ec126ef9 100644
---- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
-+++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
-@@ -359,12 +359,8 @@ endif()
- 
- #-----------------------------------------------------------------------------
- # pkgconfig support
--# enabled by default on Unix, disabled by default on other platforms
--if(UNIX)
--  option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON)
--else()
--  option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
--endif()
-+# Cannot use the built-in openjp2 because the configuration path is under buildtrees
-+option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
- if(BUILD_PKGCONFIG_FILES)
-   # install in lib and not share (see multi-arch note above)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
diff --git a/ports/itk/fix_libminc_config_path.patch b/ports/itk/fix_libminc_config_path.patch
new file mode 100644
index 000000000..3ff305d4b
--- /dev/null
+++ b/ports/itk/fix_libminc_config_path.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt b/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt
+index 305b2c63..63f81a53 100644
+--- a/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt
++++ b/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt
+@@ -550,7 +550,7 @@ IF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
+      ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake 
+      ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINCConfig.cmake
+     DESTINATION 
+-     ${LIBMINC_INSTALL_LIB_DIR}/cmake
++     share/itk
+     COMPONENT Development)
+ ENDIF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
+ 
diff --git a/ports/itk/fix_openjpeg_search.patch b/ports/itk/fix_openjpeg_search.patch
new file mode 100644
index 000000000..d17a1ab84
--- /dev/null
+++ b/ports/itk/fix_openjpeg_search.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+index 6ac16ab6..4638f13c 100644
+--- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+@@ -373,7 +373,7 @@ else()
+ endif()
+ 
+ if(GDCM_USE_SYSTEM_OPENJPEG)
+-  find_package(OpenJPEG 2.0.0 REQUIRED)
++  find_package(OpenJPEG REQUIRED)
+   set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
+ else()
+   set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake
index 77dd88d9d..a666b5713 100644
--- a/ports/itk/portfile.cmake
+++ b/ports/itk/portfile.cmake
@@ -1,19 +1,16 @@
 include(vcpkg_common_functions)
 
-string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
-if(BUILDTREES_PATH_LENGTH GREATER 50 AND CMAKE_HOST_WIN32)
-    message(WARNING "ITKs buildsystem uses very long paths and may fail on your system.\n"
-        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
-    )
-endif()
+vcpkg_buildpath_length_warning(37)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO InsightSoftwareConsortium/ITK
-    REF 3e12e7006a5881136414be54216a35bbacb55baa
-    SHA512 9796429f8750faffc87e44052455740d1a560883e83c3ed9614d1c7ae9cc1ae22a360b572d9bb1c5ec62ca12ac81d3aa0b8dbaffff3e4ad4c2f85077ed04a10b
+    REF v5.0.1
+    SHA512 242ce66cf83f82d26f20d2099108295e28c8875e7679126ba023834bf0e94454460ba86452a94c8ddaea93d2314befc399f2b151d7294370d4b47f0e9798e77f
     HEAD_REF master
-    PATCHES fix_conflict_with_openjp2_pc.patch
+    PATCHES
+        fix_openjpeg_search.patch
+        fix_libminc_config_path.patch
 )
 
 if ("vtk" IN_LIST FEATURES)
@@ -22,6 +19,11 @@ else()
     set(ITKVtkGlue OFF)
 endif()
 
+set(USE_64BITS_IDS OFF)
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+    set(USE_64BITS_IDS ON)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -33,9 +35,7 @@ vcpkg_configure_cmake(
         -DITK_INSTALL_DATA_DIR=share/itk/data
         -DITK_INSTALL_DOC_DIR=share/itk/doc
         -DITK_INSTALL_PACKAGE_DIR=share/itk
-        -DITK_LEGACY_REMOVE=ON
-        -DITK_FUTURE_LEGACY_REMOVE=ON
-        -DITK_USE_64BITS_IDS=ON
+        -DITK_USE_64BITS_IDS=${USE_64BITS_IDS}
         -DITK_USE_CONCEPT_CHECKING=ON
         #-DITK_USE_SYSTEM_LIBRARIES=ON # enables USE_SYSTEM for all third party libraries, some of which do not have vcpkg ports such as CastXML, SWIG, MINC etc
         -DITK_USE_SYSTEM_DOUBLECONVERSION=ON
@@ -66,12 +66,10 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) # combines release and debug build configurations
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/itk)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/itk/LICENSE ${CURRENT_PACKAGES_DIR}/share/itk/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)