Skip to content

Commit 5460b4b

Browse files
authored
CXX-3170 Remove MONGOCXX_OVERRIDE_DEFAULT_INSTALL_PREFIX (#1258)
1 parent 0421d99 commit 5460b4b

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
1111

1212
## Removed
1313

14+
- Support for CMake option `MONGOCXX_OVERRIDE_DEFAULT_INSTALL_PREFIX`.
15+
- `MONGOCXX_OVERRIDE_DEFAULT_INSTALL_PREFIX=OFF` is now implicit behavior.
1416
- Redeclarations of `bsoncxx::stdx` interfaces in the `mongocxx::stdx` namespace.
1517
- Use `bsoncxx::stdx::optional<T>` instead of `mongocxx::stdx::optional<T>`.
1618
- Use `bsoncxx::stdx::string_view` instead of `mongocxx::stdx::string_view`.

CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,6 @@ To build static libraries only, set both BUILD_SHARED_LIBS and BUILD_SHARED_AND_
188188
set(MONGOCXX_LINK_WITH_STATIC_MONGOC ON CACHE INTERNAL "")
189189
endif()
190190

191-
option(MONGOCXX_OVERRIDE_DEFAULT_INSTALL_PREFIX "If enabled, mongocxx will set a default CMAKE_INSTALL_PREFIX if one is not already defined" TRUE)
192-
193-
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND MONGOCXX_OVERRIDE_DEFAULT_INSTALL_PREFIX)
194-
message(WARNING
195-
"mongocxx: The default CMAKE_INSTALL_PREFIX is being overridden to the "
196-
"build directory. This behavior will not be the default in a future "
197-
"release. Build with 'MONGOCXX_OVERRIDE_DEFAULT_INSTALL_PREFIX=OFF' to opt "
198-
"into what will be the default behavior in a future release. Setting install "
199-
"path to: ${CMAKE_BINARY_DIR}/install")
200-
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "default install path" FORCE)
201-
endif()
202-
203191
include(GNUInstallDirs)
204192
include(ParseVersion)
205193

0 commit comments

Comments
 (0)