Skip to content

[itk] fix python build #33826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 1 commit into from
Oct 9, 2023
Merged

[itk] fix python build #33826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/itk/cxx17.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
3 changes: 2 additions & 1 deletion ports/itk/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ports/itk/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "itk",
"version": "5.2.1",
"port-version": 5,
"version": "5.3-rc02",
Copy link
Contributor Author

@autoantwort autoantwort Sep 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #23158 (comment)

"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",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/itk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9da4bc8949edd65bc3e0afa8e694480e330f5f40",
"version": "5.3-rc02",
"port-version": 6
},
{
"git-tree": "33def29a955f79fae7497d8be276decf175a9881",
"version": "5.2.1",
Expand Down