Skip to content

Commit 50660a9

Browse files
committed
COMP: Update cmake settings for current 5.4.2 version matching
Set version requirements for CMake and Python to match ITK 5.4.2
1 parent 20e7165 commit 50660a9

File tree

421 files changed

+438
-463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

421 files changed

+438
-463
lines changed

CMakeLists.txt

Lines changed: 7 additions & 7 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)
@@ -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.13 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/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16.3)
1+
cmake_minimum_required(VERSION 3.22.1)
22

33
if(COMMAND CMAKE_POLICY)
44
cmake_policy(SET CMP0003 NEW)

Utilities/CookieCutter/{{cookiecutter.example_name}}/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16.3)
1+
cmake_minimum_required(VERSION 3.22.1)
22

33
project({{ cookiecutter.example_name }})
44

Utilities/Dashboard/itkexamples_common.cmake

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# dashboard_superbuild = True to use the Superbuild
3939
# dashboard_upload_documentation = Upload the HTML .zip to the dashboard
4040
# (requires BUILD_DOCUMENTATION=ON in the dashboard cache)
41-
# CTEST_UPDATE_COMMAND = path to svn command-line client
41+
# CTEST_UPDATE_COMMAND = path to git command-line client
4242
# CTEST_BUILD_FLAGS = build tool arguments (ex: -j2)
4343
# CTEST_TEST_TIMEOUT = Per-test timeout length
4444
# CTEST_TEST_ARGS = ctest_test args (ex: PARALLEL_LEVEL 4)
@@ -88,7 +88,7 @@
8888
#
8989
#==========================================================================*/
9090

91-
cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
91+
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
9292

9393
set(dashboard_user_home "$ENV{HOME}")
9494

@@ -289,23 +289,6 @@ foreach(v
289289
endforeach()
290290
message("Dashboard script configuration:\n${vars}\n")
291291

292-
# Git does not update submodules by default so they appear as local
293-
# modifications in the work tree. CTest 2.8.2 does this automatically.
294-
# To support CTest 2.8.0 and 2.8.1 we wrap Git in a script.
295-
if(${CMAKE_VERSION} VERSION_LESS 2.8.2)
296-
if(UNIX)
297-
configure_file(${dashboard_self_dir}/gitmod.sh.in
298-
${CTEST_DASHBOARD_ROOT}/gitmod.sh
299-
@ONLY)
300-
set(CTEST_GIT_COMMAND ${CTEST_DASHBOARD_ROOT}/gitmod.sh)
301-
else()
302-
configure_file(${dashboard_self_dir}/gitmod.bat.in
303-
${CTEST_DASHBOARD_ROOT}/gitmod.bat
304-
@ONLY)
305-
set(CTEST_GIT_COMMAND ${CTEST_DASHBOARD_ROOT}/gitmod.bat)
306-
endif()
307-
endif()
308-
309292
# Avoid non-ascii characters in tool output.
310293
set(ENV{LC_ALL} C)
311294

@@ -351,13 +334,6 @@ if(NOT DEFINED dashboard_loop)
351334
endif()
352335
endif()
353336

354-
# CTest 2.6 crashes with message() after ctest_test.
355-
macro(safe_message)
356-
if(NOT "${CMAKE_VERSION}" VERSION_LESS 2.8 OR NOT safe_message_skip)
357-
message(${ARGN})
358-
endif()
359-
endmacro()
360-
361337
if(COMMAND dashboard_hook_init)
362338
dashboard_hook_init()
363339
endif()
@@ -379,14 +355,14 @@ while(NOT dashboard_done)
379355
set(dashboard_fresh 0)
380356
if(NOT EXISTS "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt")
381357
set(dashboard_fresh 1)
382-
safe_message("Starting fresh build...")
358+
message("Starting fresh build...")
383359
write_cache()
384360
endif()
385361

386362
# Look for updates.
387363
ctest_update(RETURN_VALUE count)
388364
set(CTEST_CHECKOUT_COMMAND) # checkout on first iteration only
389-
safe_message("Found ${count} changed files")
365+
message("Found ${count} changed files")
390366

391367
if(dashboard_fresh OR NOT dashboard_continuous OR count GREATER 0)
392368
# Initial configure needs ITK_BUILD_ALL_MODULES ON to gather full dependency
@@ -396,7 +372,7 @@ while(NOT dashboard_done)
396372
set_property(GLOBAL PROPERTY SubProject ${main_project_name})
397373
set_property(GLOBAL PROPERTY Label ${main_project_name})
398374

399-
safe_message("Initial configure top level project...")
375+
message("Initial configure top level project...")
400376
set(options
401377
-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}
402378
)
@@ -429,7 +405,6 @@ while(NOT dashboard_done)
429405
else()
430406
ctest_test(${CTEST_TEST_ARGS})
431407
endif()
432-
set(safe_message_skip 1) # Block further messages
433408
if(NOT dashboard_no_submit)
434409
ctest_submit(PARTS Test)
435410
endif()

src/Bridge/NumPy/ConvertNumPyArrayToitkImage/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16.3)
1+
cmake_minimum_required(VERSION 3.22.1)
22

33
project( ConvertNumPyArrayToitkImage )
44

src/Bridge/VtkGlue/ConvertAnRGBitkImageTovtkImageData/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16.3)
1+
cmake_minimum_required(VERSION 3.22.1)
22

33
project(ConvertAnRGBitkImageTovtkImageData)
44

src/Bridge/VtkGlue/ConvertAnitkImageTovtkImageData/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16.3)
1+
cmake_minimum_required(VERSION 3.22.1)
22

33
project(ConvertAnitkImageTovtkImageData)
44

src/Bridge/VtkGlue/ConvertRGBvtkImageDataToAnitkImage/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16.3)
1+
cmake_minimum_required(VERSION 3.22.1)
22

33
project(ConvertRGBvtkImageDataToAnitkImage)
44

src/Bridge/VtkGlue/ConvertvtkImageDataToAnitkImage/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16.3)
1+
cmake_minimum_required(VERSION 3.22.1)
22

33
project(ConvertvtkImageDataToAnitkImage)
44

src/Bridge/VtkGlue/VTKImageToITKImage/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16.3)
1+
cmake_minimum_required(VERSION 3.22.1)
22

33
project(VTKImageToITKImage)
44

0 commit comments

Comments
 (0)