Skip to content

Commit 947472d

Browse files
committed
ENH: Change cmake support ranges
Be in sync with Slicer and ITK cmake minimums.
1 parent 9f9d283 commit 947472d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cmake_minimum_required(VERSION 3.16.3...3.20.3)
2-
cmake_policy(VERSION 3.16.3...3.20.3)
1+
cmake_minimum_required(VERSION 3.20.6...4.1.2 FATAL_ERROR)
2+
cmake_policy(VERSION 3.20.6...4.1.2)
33

44
#-----------------------------------------------------------------------------
55
# Enable C++17
@@ -15,7 +15,7 @@ endif()
1515
if(NOT CMAKE_CXX_EXTENSIONS)
1616
set(CMAKE_CXX_EXTENSIONS OFF)
1717
endif()
18-
set(VALID_CXX_STANDARDS "17" "20" "23")
18+
set(VALID_CXX_STANDARDS "17" "20" "23" "26")
1919
if(NOT CMAKE_CXX_STANDARD IN_LIST VALID_CXX_STANDARDS )
2020
MESSAGE(FATAL_ERROR "CMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD} not in know standards list\n ${VALID_CXX_STANDARDS} for BRAINSTools version 5 and greater.")
2121
endif()

SuperBuild/External_zlib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if(NOT DEFINED ZLIB_ROOT AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
5050
INSTALL_DIR ${EP_INSTALL_DIR}
5151
CMAKE_CACHE_ARGS
5252
## CXX should not be needed, but it a cmake default test
53-
-DCMAKE_POLICY_VERSION_MINIMUM=3.20.6
53+
-DCMAKE_POLICY_VERSION_MINIMUM:STRING=3.20
5454
${EXTERNAL_PROJECT_DEFAULTS}
5555
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
5656
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}

0 commit comments

Comments
 (0)