From b5aba60dc108163e0ec2eac70e2b400b042ed955 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 14 Jan 2024 13:15:27 +0100 Subject: [PATCH] CMake: add a policy_max to cmake_minimum_required(), and remove obsolete cmake_policy() statements --- CMakeLists.txt | 6 +----- cmake/policies.cmake | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 cmake/policies.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 45bd855bd8..0f3b01a3d1 100644 --- 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 deleted file mode 100644 index 35d0545ca5..0000000000 --- a/cmake/policies.cmake +++ /dev/null @@ -1,4 +0,0 @@ -if(CMAKE_MAJOR_VERSION GREATER 2) - cmake_policy(SET CMP0042 NEW) # osx rpath - cmake_policy(SET CMP0011 NEW) # policy setting -endif()