Skip to content

Commit 016eb75

Browse files
blowekampmalaterre
blowekamp
authored and
malaterre
committed
Use cmake_minimum_required to set min and policy_max
CMake version >3.30 produce a deprecated awarning when only, a min argument less that 3.10 is pass to cmake_minimum_required. Using the additional policy_max version range specified the max policy setting at the same time.
1 parent e010a10 commit 016eb75

File tree

11 files changed

+13
-62
lines changed

11 files changed

+13
-62
lines changed

‎CMakeLists.txt

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
cmake_minimum_required(VERSION 3.9.2 FATAL_ERROR)
1+
set(GDCM_MAX_VALIDATED_CMAKE_VERSION "3.13.4")
22

3-
set(GDCM_MAX_VALIDATED_CMAKE_VERSION "3.13.1")
4-
if("${CMAKE_VERSION}" VERSION_LESS_EQUAL "${GDCM_MAX_VALIDATED_CMAKE_VERSION}")
5-
# As of 2018-12-04 GDCM has been validated to build with cmake version 3.13.1 new policies.
6-
# Set and use the newest cmake policies that are validated to work
7-
set(GDCM_CMAKE_POLICY_VERSION "${CMAKE_VERSION}")
8-
else()
9-
set(GDCM_CMAKE_POLICY_VERSION "${GDCM_MAX_VALIDATED_CMAKE_VERSION}")
10-
endif()
11-
cmake_policy(VERSION ${GDCM_CMAKE_POLICY_VERSION})
3+
# Set minimum required version of CMake, and policy version
4+
cmake_minimum_required(VERSION 3.9.2...${GDCM_MAX_VALIDATED_CMAKE_VERSION} FATAL_ERROR) # travis-ci wants 3.9.2
125

136
# GDCM version 3.0.0 will only support C++11 and greater
147
if(CMAKE_CXX_STANDARD EQUAL "98" )

‎Examples/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.7)
1+
cmake_minimum_required(VERSION 2.8.7...3.13.4)
22

33
# Choose behavior based on whether we are building inside the GDCM tree.
44
if(GDCM_BINARY_DIR)

‎Utilities/gdcmcharls/CMakeLists.txt

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
2-
cmake_minimum_required(VERSION 2.8.7)
2+
cmake_minimum_required(VERSION 2.8.7...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
33
endif()
44

55
if(NOT CHARLS_NAMESPACE)
@@ -11,14 +11,6 @@ string(TOLOWER ${CHARLS_NAMESPACE} CHARLS_LIBRARY_NAME)
1111

1212
project(${CHARLS_NAMESPACE} CXX)
1313

14-
foreach(p
15-
CMP0042
16-
CMP0063
17-
)
18-
if(POLICY ${p})
19-
cmake_policy(SET ${p} NEW)
20-
endif()
21-
endforeach()
2214

2315
#-----------------------------------------------------------------------------
2416
# CHARLS version number

‎Utilities/gdcmexpat/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
2-
cmake_minimum_required(VERSION 2.8.7)
2+
cmake_minimum_required(VERSION 2.8.7...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
33
endif()
44

55
if(NOT EXPAT_NAMESPACE)

‎Utilities/gdcmjpeg/CMakeLists.txt

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
2-
cmake_minimum_required(VERSION 2.8.7)
2+
cmake_minimum_required(VERSION 2.8.7...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
33
endif()
44

55
if(NOT JPEG_NAMESPACE)
@@ -17,14 +17,6 @@ string(TOLOWER ${JPEG_NAMESPACE} JPEG_LIBRARY_NAME)
1717

1818
project(${JPEG_NAMESPACE} C)
1919

20-
foreach(p
21-
CMP0042
22-
CMP0063
23-
)
24-
if(POLICY ${p})
25-
cmake_policy(SET ${p} NEW)
26-
endif()
27-
endforeach()
2820

2921
# Do full dependency headers.
3022
include_regular_expression("^.*$")

‎Utilities/gdcmmd5/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
2-
cmake_minimum_required(VERSION 2.8.7)
2+
cmake_minimum_required(VERSION 2.8.7...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
33
endif()
44

55
if(NOT MD5_NAMESPACE)

‎Utilities/gdcmopenjpeg/CMakeLists.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,7 @@
88
# e.g.:
99
# set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
1010
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
11-
cmake_minimum_required(VERSION 2.8.2)
12-
endif()
13-
14-
if(COMMAND CMAKE_POLICY)
15-
cmake_policy(SET CMP0003 NEW)
16-
if (NOT (${CMAKE_VERSION} VERSION_LESS 3.0))
17-
cmake_policy(SET CMP0042 NEW)
18-
endif()
19-
20-
foreach(p
21-
CMP0042
22-
CMP0063
23-
)
24-
if(POLICY ${p})
25-
cmake_policy(SET ${p} NEW)
26-
endif()
27-
endforeach()
11+
cmake_minimum_required(VERSION 2.8.2...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
2812
endif()
2913

3014
if(NOT OPENJPEG_NAMESPACE)

‎Utilities/gdcmuuid/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
2-
cmake_minimum_required(VERSION 2.8.7)
2+
cmake_minimum_required(VERSION 2.8.7...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
33
endif()
44

55
if(NOT UUID_NAMESPACE)

‎Utilities/gdcmzlib/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
2-
cmake_minimum_required(VERSION 2.8.7)
2+
cmake_minimum_required(VERSION 2.8.7...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
33
endif()
44

55
if(NOT ZLIB_NAMESPACE)

‎Utilities/getopt/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
2-
cmake_minimum_required(VERSION 2.8.7)
2+
cmake_minimum_required(VERSION 2.8.7...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
33
endif()
44

55
if(NOT GETOPT_NAMESPACE)

‎Utilities/socketxx/CMakeLists.txt

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
if(NOT DEFINED CMAKE_MINIMUM_REQUIRED_VERSION)
2-
cmake_minimum_required(VERSION 2.8.7)
2+
cmake_minimum_required(VERSION 2.8.7...${GDCM_MAX_VALIDATED_CMAKE_VERSION})
33
endif()
44

5-
foreach(p
6-
CMP0022
7-
CMP0042
8-
CMP0063 # CMake 3.3.2
9-
)
10-
if(POLICY ${p})
11-
cmake_policy(SET ${p} NEW)
12-
endif()
13-
endforeach()
14-
155
# http://www.linuxhacker.at/socketxx
166
if(NOT SOCKETXX_NAMESPACE)
177
set(SOCKETXX_NAMESPACE "SOCKETXX")

0 commit comments

Comments
 (0)