Skip to content

Commit 87fe6be

Browse files
hjmjohnsondzenanz
hjmjohnson
authored and
dzenanz
committed
ENH: Update minimum cmake versions allowed.
1 parent 06b02b3 commit 87fe6be

File tree

420 files changed

+430
-455
lines changed

Some content is hidden

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

420 files changed

+430
-455
lines changed

‎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
project(ITKSphinxExamples)
44

‎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: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -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

‎src/Bridge/VtkGlue/VisualizeEvolvingDense2DLevelSetAsElevationMap/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(VisualizeEvolvingDense2DLevelSetAsElevationMap)
44

0 commit comments

Comments
 (0)