Skip to content

MONGOCRYPT-839 set CMake minimum required version to 3.15...4.0 #1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eramongodb merged 2 commits into from
Aug 12, 2025
Merged

MONGOCRYPT-839 set CMake minimum required version to 3.15...4.0 #1052

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
747c3f6
MONGOCRYPT-839 set CMake minimum required version to 3.15...4.0
eramongodb Aug 12, 2025
20aae6a
Also remove CMP0091 check
eramongodb Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .evergreen/linker_tests_deps/app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cmake_minimum_required (VERSION 3.5)
cmake_minimum_required (VERSION 3.15...4.0)
project (app C)
add_executable (app app.c)
find_package (bson-1.0 1.11 REQUIRED)
message ("-- libbson found version \"${bson-1.0_VERSION}\"")
target_link_libraries (app PRIVATE mongo::bson_static)

find_package (mongocrypt REQUIRED)
target_link_libraries (app PRIVATE mongo::mongocrypt)
target_link_libraries (app PRIVATE mongo::mongocrypt)
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# ChangeLog

## 1.16.0 (Unreleased)

### Changed

- Set CMake minimum required version to `3.15...4.0` (with maximum policy version set to `4.0`).

## 1.15.0

### New features
Expand Down
13 changes: 1 addition & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
cmake_minimum_required (VERSION 3.12)

# Preempt the MSVC_RUNTIME_LIBRARY properties
if (POLICY CMP0091)
cmake_policy (SET CMP0091 NEW)
elseif (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
message (WARNING "The CMAKE_MSVC_RUNTIME_LIBRARY variable is set, but CMake is too old to understand it")
endif ()

if (POLICY CMP0135)
cmake_policy (SET CMP0135 NEW)
endif ()
cmake_minimum_required (VERSION 3.15...4.0)

project (mongocrypt C)

Expand Down
9 changes: 1 addition & 8 deletions cmake/MongoC-Warnings.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,7 @@ function (mongoc_add_platform_compile_options)
endforeach ()
endfunction ()

if (CMAKE_VERSION VERSION_LESS 3.3)
# On older CMake versions, we'll just always pass the warning options, even
# if the generate warnings for the C++ check file
set (is_c_lang "1")
else ()
# $<COMPILE_LANGUAGE> is only valid in CMake 3.3+
set (is_c_lang "$<COMPILE_LANGUAGE:C>")
endif ()
set (is_c_lang "$<COMPILE_LANGUAGE:C>")

# These below warnings should always be unconditional hard errors, as the code is
# almost definitely broken
Expand Down
5 changes: 2 additions & 3 deletions kms-message/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.5)
cmake_minimum_required (VERSION 3.15...4.0)
project (kms_message
VERSION 0.0.1
LANGUAGES C
Expand All @@ -7,8 +7,7 @@ project (kms_message
set (CMAKE_C_STANDARD 99)

include (CheckCCompilerFlag)
# All targets obey visibility, not just library targets.
cmake_policy (SET CMP0063 NEW)

set (CMAKE_C_VISIBILITY_PRESET hidden)
set (KMS_MESSAGE_SOURCES
src/kms_b64.c
Expand Down