Skip to content

Commit 53c53a6

Browse files
committed
COMP: Update to ITK v6.0 and related package versions.
1 parent d8f0a55 commit 53c53a6

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# CMake versions greater than the ITKEX_NEWEST_VALIDATED_POLICIES_VERSION policies will
1111
# continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"
1212
#
13-
set(ITKEX_OLDEST_VALIDATED_POLICIES_VERSION "3.16.3")
14-
set(ITKEX_NEWEST_VALIDATED_POLICIES_VERSION "3.19.7")
13+
set(ITKEX_OLDEST_VALIDATED_POLICIES_VERSION "3.22.1")
14+
set(ITKEX_NEWEST_VALIDATED_POLICIES_VERSION "3.31.5")
1515
cmake_minimum_required(VERSION ${ITKEX_OLDEST_VALIDATED_POLICIES_VERSION} FATAL_ERROR)
1616
if("${CMAKE_VERSION}" VERSION_LESS_EQUAL "${ITKEX_NEWEST_VALIDATED_POLICIES_VERSION}")
1717
#Set and use the newest available cmake policies that are validated to work
@@ -36,14 +36,14 @@ foreach(pold "") # Currently Empty
3636
endforeach()
3737

3838
# ==== Define language standard configurations requiring at least c++14 standard
39-
if(CMAKE_CXX_STANDARD EQUAL "98" OR CMAKE_CXX_STANDARD LESS "14")
40-
message(FATAL_ERROR "C++98 to C++11 are no longer supported in ITK version 5.3 and greater.")
39+
if(CMAKE_CXX_STANDARD EQUAL "98" OR CMAKE_CXX_STANDARD LESS "17")
40+
message(FATAL_ERROR "C++98 to C++11 are no longer supported in ITK version v6 and greater.")
4141
endif()
4242

4343
#####
4444
## Set the default target properties for ITK
4545
if(NOT CMAKE_CXX_STANDARD)
46-
set(CMAKE_CXX_STANDARD 14) # Supported values are ``14``, ``17``, and ``20``.
46+
set(CMAKE_CXX_STANDARD 17) # Supported values are ``17``, and ``20``.
4747
endif()
4848
if(NOT CMAKE_CXX_STANDARD_REQUIRED)
4949
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -80,7 +80,7 @@ endif()
8080
if(NOT ITK_VERSION)
8181
# To get the ITK version information from external package when building
8282
# stand alone, ITK is required.
83-
find_package(ITK 5.3.0 REQUIRED)
83+
find_package(ITK 6.0.0 REQUIRED)
8484
endif()
8585
set(ITKSphinxExamples_VERSION_MAJOR ${ITK_VERSION_MAJOR})
8686
set(ITKSphinxExamples_VERSION_MINOR ${ITK_VERSION_MINOR})
@@ -138,8 +138,8 @@ foreach(link ${content_links})
138138
endforeach()
139139
ExternalData_Add_Target(ITKSphinxExamplesData)
140140

141-
set(PYTHON_REQUIRED_VERSION 3.7)
142-
set(Python_ADDITIONAL_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7)
141+
set(PYTHON_REQUIRED_VERSION 3.9)
142+
set(Python_ADDITIONAL_VERSIONS 3.12 3.11 3.10 3.9)
143143
if(BUILD_TESTING OR ITK_BUILD_DOCUMENTATION OR ITK_WRAP_PYTHON)
144144
if(ITK_WRAP_PYTHON)
145145
# Use the same Python interpreter as ITK to run the tests.

Superbuild/External-ITK.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Get and build itk
33

44
if(NOT ITK_TAG)
5-
# ITK release 2024-05-22
6-
set(ITK_TAG "v5.4.0")
5+
# ITK release 2025-01-30
6+
set(ITK_TAG "a5dd51be8ae8e3104f15b18202bec53408f70870")
77
endif()
88

99
set(_vtk_args)

Superbuild/External-Python.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ ExternalProject_Add(ITKPython
1818
DOWNLOAD_COMMAND ""
1919
CONFIGURE_COMMAND ${Python3_EXECUTABLE} -m venv "${_itk_venv}"
2020
BUILD_COMMAND ${ITKPython3_EXECUTABLE} -m pip install --upgrade pip
21-
INSTALL_COMMAND ${ITKPython3_EXECUTABLE} -m pip install --ignore-installed itk>=5.4.0 sphinx==7.2.6 six black nbsphinx ipywidgets sphinx-contributors ipykernel matplotlib itkwidgets[lab,notebook]>=1.0a51 pydata-sphinx-theme
21+
INSTALL_COMMAND ${ITKPython3_EXECUTABLE} -m pip install --ignore-installed itk>=6.0a1 sphinx==8.1.3 six black nbsphinx ipywidgets sphinx-contributors ipykernel matplotlib itkwidgets[lab,notebook]>=1.0a54 pydata-sphinx-theme
2222
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKBlackConfig.cmake
2323
)

0 commit comments

Comments
 (0)