CMake: add a policy_max to cmake_minimum_required(), and remove obsol…

…ete cmake_policy() statements
OSGeo · Jan 14, 2024 · b5aba60 · b5aba60
1 parent 95db9aa
commit b5aba60
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,16 +9,13 @@
 ################################################################################
 # General settings
 ################################################################################
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.28)
 
 project(PROJ
   DESCRIPTION "PROJ coordinate transformation software library"
   LANGUAGES C CXX
 )
 
-# Only interpret if() arguments as variables or keywords when unquoted
-cmake_policy(SET CMP0054 NEW)
-
 # Set C++ version
 # Make CMAKE_CXX_STANDARD available as cache option overridable by user
 set(CMAKE_CXX_STANDARD 11
@@ -126,7 +123,6 @@ set(PROJ_BUILD_VERSION "${PROJ_SOVERSION}.${PROJ_VERSION}")
 include(Ccache)
 include(ProjConfig)
 include(ProjMac)
-include(policies)
 
 ################################################################################
 # Check for nlohmann_json

diff --git a/cmake/policies.cmake b/cmake/policies.cmake