Skip to content

Commit 2b2cd11

Browse files
[MONGOCRYPT-876] Remove ENABLE_WINDOWS_STATIC_RUNTIME (mongodb#1115)
This simply removes the `ENABLE_WINDOWS_STATIC_RUNTIME` configuration parameter from the CMake project. CMake 3.15 offers a built-in way for users to control this aspect of the build, so it is not necessary that we offer it.
1 parent 47bbf26 commit 2b2cd11

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# ChangeLog
22

3+
## Unreleased
4+
5+
### Removed
6+
7+
- The configure-time CMake parameter `ENABLE_WINDOWS_STATIC_RUNTIME` has been
8+
removed. Users that need the static MSVCRT library should instead set the
9+
[`CMAKE_MSVC_RUNTIME_LIBRARY`][msvcrt] built-in CMake parameter when
10+
configuring libmongocrypt.
11+
12+
[msvcrt]: https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html
13+
314
## 1.17.1
415

516
Add package for Debian Trixie.
@@ -202,7 +213,7 @@ This release makes backwards breaking changes to Queryable Encryption (QE) behav
202213
## Warnings
203214
- This release has a severe bug in the context returned by `mongocrypt_ctx_rewrap_many_datakey_init` that may result in data corruption. Please upgrade to 1.5.2 before using `mongocrypt_ctx_rewrap_many_datakey_init`.
204215
## Fixed
205-
- Update to use new payload for FLE 2.0 find.
216+
- Update to use new payload for FLE 2.0 find.
206217
- Require contention factor.
207218
## 1.5.0-rc2
208219
### Fixed
@@ -222,7 +233,7 @@ This release makes backwards breaking changes to Queryable Encryption (QE) behav
222233
## 1.5.0-rc0
223234
## Fixed
224235
- Account for shared library rename.
225-
- Update to use new payload for FLE 2.0 find.
236+
- Update to use new payload for FLE 2.0 find.
226237

227238
## 1.5.0-alpha2
228239
## New Features

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ option (ENABLE_PIC
1515
option (ENABLE_BUILD_FOR_PPA "Maintainer-only option for preparing PPA build" OFF)
1616
option (ENABLE_ONLINE_TESTS "Enable online tests and the csfle utility. Requires libmongoc." ON)
1717

18-
if (ENABLE_WINDOWS_STATIC_RUNTIME)
19-
set (CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
20-
endif ()
21-
2218
if (MINGW)
2319
# MSVCRT-based mingw-w64 GCC requires this macro to enable C99 format specifiers. This does not apply to UCRT-based
2420
# mingw-w64 GCC, but apply the workaround anyways until bson-compat.h no longer requires this.

0 commit comments

Comments
 (0)