Skip to content

Commit 088e94f

Browse files
3nidsnyalldawson
authored andcommitted
[cmake] fix deprecated OLD policy for CMP0053
https://cmake.org/cmake/help/v3.1/policy/CMP0053.html
1 parent d674a53 commit 088e94f

File tree

3 files changed

+15
-20
lines changed

3 files changed

+15
-20
lines changed

CMakeLists.txt

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1+
#############################################################
2+
# CMake settings
3+
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)
4+
SET(CMAKE_COLOR_MAKEFILE ON)
5+
# set path to additional CMake modules
6+
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
7+
# POLICIES
8+
CMAKE_POLICY (SET CMP0048 NEW)
9+
CMAKE_POLICY (SET CMP0053 NEW)
10+
11+
#############################################################
12+
# Project and version
113
SET(CPACK_PACKAGE_VERSION_MAJOR "3")
214
SET(CPACK_PACKAGE_VERSION_MINOR "1")
315
SET(CPACK_PACKAGE_VERSION_PATCH "0")
416
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
517
SET(RELEASE_NAME "Master")
6-
IF (POLICY CMP0048)
7-
CMAKE_POLICY (SET CMP0048 NEW)
8-
ENDIF (POLICY CMP0048)
918
PROJECT(qgis VERSION ${COMPLETE_VERSION})
1019
IF (APPLE)
1120
SET(QGIS_APP_NAME "QGIS")
@@ -17,16 +26,8 @@ ENDIF (APPLE)
1726
MATH(EXPR QGIS_VERSION_INT "${CPACK_PACKAGE_VERSION_MAJOR}*10000+${CPACK_PACKAGE_VERSION_MINOR}*100+${CPACK_PACKAGE_VERSION_PATCH}")
1827
MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSION_INT})")
1928

20-
#############################################################
21-
# CMake settings
22-
23-
CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
24-
25-
SET(CMAKE_COLOR_MAKEFILE ON)
26-
27-
# set path to additional CMake modules
28-
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
2929

30+
#############################################################
3031
# Configure CCache if available
3132
option(USE_CCACHE "Use ccache" ON)
3233
if (USE_CCACHE)

cmake/FindGDAL.cmake

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
#
1414
# GDAL_INCLUDE_DIR = where to find headers
1515

16-
IF (POLICY CMP0053) # in CMake 3.1.0+
17-
CMAKE_POLICY (SET CMP0053 OLD) # keep old-style @VAR@ expansion
18-
ENDIF (POLICY CMP0053)
19-
INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacPlistMacros.cmake)
16+
INCLUDE (${CMAKE_SOURCE_DIR}/cmake/MacPlistMacros.cmake)
2017

2118
IF(WIN32)
2219

cmake/FindGEOS.cmake

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
# GEOS_LIBRARY
1414
#
1515

16-
IF (POLICY CMP0053) # in CMake 3.1.0+
17-
CMAKE_POLICY (SET CMP0053 OLD) # keep old-style @VAR@ expansion
18-
ENDIF (POLICY CMP0053)
19-
INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacPlistMacros.cmake)
16+
INCLUDE (${CMAKE_SOURCE_DIR}/cmake/MacPlistMacros.cmake)
2017

2118
IF(WIN32)
2219

0 commit comments

Comments
 (0)