CDRIVER-6059 Set CMake max policy version to 4.0 (#2066)

eramongodb · web-flow · commit e8ea70127f7b · 2025-07-22T15:47:09.000-05:00
diff --git a/.evergreen/scripts/compile-std.sh b/.evergreen/scripts/compile-std.sh
@@ -119,7 +119,7 @@ fi
 echo "Checking requested C standard is supported..."
 pushd "$(mktemp -d)"
 cat >CMakeLists.txt <<DOC
-cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.30...4.0)
 project(c_standard_latest LANGUAGES C)
 set(c_std_version "${C_STD_VERSION:?}")
 if(c_std_version STREQUAL "latest") # Special-case MSVC's /std:clatest flag.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.15)
+cmake_minimum_required (VERSION 3.15...4.0)
 
 list (INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}/build/cmake")
 # Defines BUILD_VERSION, which we use throughout:
@@ -348,11 +348,6 @@ if(WIN32)
    set (CMAKE_IMPORT_LIBRARY_SUFFIX .dll.lib)
 endif()
 
-# https://cmake.org/cmake/help/v3.11/policy/CMP0042.html
-# Enable a CMake 3.0+ policy that sets CMAKE_MACOSX_RPATH by default, and
-# silence a CMake 3.11 warning that the old behavior is deprecated.
-cmake_policy (SET CMP0042 NEW)
-
 # By default, ensure conformance with a minimum C standard.
 # Required extensions to the language (i.e. POSIX) are (re)enabled further below.
 if (NOT DEFINED CMAKE_C_STANDARD)
diff --git a/NEWS b/NEWS
@@ -7,7 +7,9 @@ libmongoc 2.1.0 (Unreleased)
 
 ## Changes
 
-Removed:
+* The CMake project now sets a CMake policy max version of `4.0` (previously unset).
+
+## Removed
 
 * Support for Debian 9 and Debian 10.
 
diff --git a/build/cmake/GenerateUninstaller.cmake b/build/cmake/GenerateUninstaller.cmake
@@ -1,5 +1,3 @@
-cmake_policy(VERSION 3.15)
-
 if(NOT CMAKE_SCRIPT_MODE_FILE)
     # We are being included from within a project, so we should generate the install rules
     # The script name is "uninstall" by default:
diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt
@@ -11,7 +11,7 @@
 #                                     888
 #                                     888
 
-cmake_minimum_required (VERSION 3.15)
+cmake_minimum_required (VERSION 3.15...4.0)
 
 project (libbson
    LANGUAGES C
diff --git a/src/libbson/NEWS b/src/libbson/NEWS
@@ -1,6 +1,10 @@
 libbson 2.1.0 (Unreleased)
 ==========================
 
+Changed:
+
+* The CMake project now sets a CMake policy max version of `4.0` (previously unset).
+
 Removed:
 
 * Support for Debian 9 and Debian 10.
diff --git a/src/libbson/examples/cmake/find_package/CMakeLists.txt b/src/libbson/examples/cmake/find_package/CMakeLists.txt
@@ -15,7 +15,7 @@
 # Demonstrates how to use the CMake 'find_package' mechanism to locate
 # and build against libbson.
 
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.15...4.0)
 
 project (hello_bson LANGUAGES C)
 
diff --git a/src/libbson/examples/cmake/find_package_static/CMakeLists.txt b/src/libbson/examples/cmake/find_package_static/CMakeLists.txt
@@ -15,7 +15,7 @@
 # Demonstrates how to use the CMake 'find_package' mechanism to locate
 # and build against libbson.
 
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.15...4.0)
 
 project (hello_bson LANGUAGES C)
 
diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.15)
+cmake_minimum_required (VERSION 3.15...4.0)
 
 project (libmongoc
    LANGUAGES C
diff --git a/src/libmongoc/examples/cmake/find_package/CMakeLists.txt b/src/libmongoc/examples/cmake/find_package/CMakeLists.txt
@@ -15,7 +15,7 @@
 # Demonstrates how to use the CMake 'find_package' mechanism to locate
 # and build against libmongoc.
 
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.15...4.0)
 
 project (hello_mongoc LANGUAGES C)
 
diff --git a/src/libmongoc/examples/cmake/find_package_static/CMakeLists.txt b/src/libmongoc/examples/cmake/find_package_static/CMakeLists.txt
@@ -15,7 +15,7 @@
 # Demonstrates how to use the CMake 'find_package' mechanism to locate
 # and build against libmongoc.
 
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.15...4.0)
 
 project (hello_mongoc LANGUAGES C)
 
diff --git a/src/libmongoc/examples/cmake/vcpkg/CMakeLists.txt b/src/libmongoc/examples/cmake/vcpkg/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required (VERSION 3.15...4.0)
 project(vcpkg-example-project)
 
 find_package(mongoc CONFIG REQUIRED)
diff --git a/src/libmongoc/tests/cmake-import/CMakeLists.txt b/src/libmongoc/tests/cmake-import/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required (VERSION 3.15...4.0)
 project(ImportTestProject)
 
 include(CTest)
diff --git a/src/libmongoc/tests/pkg-config-import/CMakeLists.txt b/src/libmongoc/tests/pkg-config-import/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required (VERSION 3.15...4.0)
 project(pkg-config-import-test LANGUAGES C)
 
 # This is a test case that tries to build against bson/mongoc using pkg-config.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-cmake_policy(VERSION 3.15)`
`2`		`-`
`3`	`1`	`if(NOT CMAKE_SCRIPT_MODE_FILE)`
`4`	`2`	`# We are being included from within a project, so we should generate the install rules`
`5`	`3`	`# The script name is "uninstall" by default:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required (VERSION 3.15)`
	`1`	`+cmake_minimum_required (VERSION 3.15...4.0)`
`2`	`2`
`3`	`3`	`project (libmongoc`
`4`	`4`	`LANGUAGES C`