From a40d7ca73b48c4ad1967204fe9fc7da75cf17f83 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Sun, 17 Sep 2023 21:56:24 +0200 Subject: [PATCH] [itk] fix python build --- ports/itk/cxx17.patch | 12 ++++++++++++ ports/itk/portfile.cmake | 3 ++- ports/itk/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/i-/itk.json | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 ports/itk/cxx17.patch diff --git a/ports/itk/cxx17.patch b/ports/itk/cxx17.patch new file mode 100644 index 00000000000000..65df5d6f8d6b4a --- /dev/null +++ b/ports/itk/cxx17.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/ITKInitializeCXXStandard.cmake b/CMake/ITKInitializeCXXStandard.cmake +index 5345230b..a9ca48c3 100644 +--- a/CMake/ITKInitializeCXXStandard.cmake ++++ b/CMake/ITKInitializeCXXStandard.cmake +@@ -1,6 +1,6 @@ + ## Set the default target properties for ITK + if(NOT CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 14) # Supported values are 14, 17, 20, and 23. ++ set(CMAKE_CXX_STANDARD 17) # Supported values are 14, 17, 20, and 23. + endif() + if(NOT CMAKE_CXX_STANDARD_REQUIRED) + set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 72d23133170d62..c1fda38e51581e 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO InsightSoftwareConsortium/ITK - REF 95800fd4d4b08678a6c0ebb63eb242893025b660 #5.2.1 + REF v5.3-rc02 SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2 HEAD_REF master PATCHES @@ -15,6 +15,7 @@ vcpkg_from_github( opencl.patch use-the-lrintf-intrinsic.patch dont-build-gtest.patch + cxx17.patch # See https://github.com/InsightSoftwareConsortium/ITK/issues/4213#issuecomment-1722547712 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index e81f2229e03cb0..060fb32c850698 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", - "version": "5.2.1", - "port-version": 5, + "version": "5.3-rc02", + "port-version": 6, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e8fa6ce84d44e8..9282d26adb3c25 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3477,8 +3477,8 @@ "port-version": 0 }, "itk": { - "baseline": "5.2.1", - "port-version": 5 + "baseline": "5.3-rc02", + "port-version": 6 }, "itpp": { "baseline": "4.3.1", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index b848437c2c790c..bf4d9c7fd153fc 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9da4bc8949edd65bc3e0afa8e694480e330f5f40", + "version": "5.3-rc02", + "port-version": 6 + }, { "git-tree": "33def29a955f79fae7497d8be276decf175a9881", "version": "5.2.1",