early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,12 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f7a16aa1..326edd332 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,7 @@
add_definitions(-DMONGO_CXX_DRIVER_COMPILING)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+add_definitions(-D_DISABLE_EXTENDED_ALIGNED_STORAGE)
add_subdirectory(bsoncxx)
add_subdirectory(mongocxx)

View File

@@ -0,0 +1,47 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2bc2a17c..347faa5ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,6 +190,7 @@ set (BUILD_SOURCE_DIR ${CMAKE_BINARY_DIR})
include (MakeDistFiles)
+if(0)
add_custom_target(hugo_dir
COMMAND ${CMAKE_COMMAND} -E make_directory hugo
)
@@ -248,6 +249,8 @@ add_custom_target(docs
set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party)
+endif()
+
enable_testing()
add_subdirectory(src)
diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
index 480b7cd32..b890c36b6 100644
--- a/src/bsoncxx/CMakeLists.txt
+++ b/src/bsoncxx/CMakeLists.txt
@@ -204,7 +204,7 @@ if(BSONCXX_BUILD_STATIC)
endif()
bsoncxx_install("${bsoncxx_target_list}" "${bsoncxx_pkg_dep}")
-add_subdirectory(test)
+# add_subdirectory(test)
set_local_dist (src_bsoncxx_DIST_local
CMakeLists.txt
diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
index f67ae35f7..b783a4716 100644
--- a/src/mongocxx/CMakeLists.txt
+++ b/src/mongocxx/CMakeLists.txt
@@ -231,7 +231,7 @@ if(MONGOCXX_BUILD_STATIC)
endif()
mongocxx_install("${mongocxx_target_list}" "${mongocxx_pkg_dep}")
-add_subdirectory(test)
+# add_subdirectory(test)
set_local_dist (src_mongocxx_DIST_local
CMakeLists.txt

View File

@@ -0,0 +1,11 @@
diff --git a/src/bsoncxx/cmake/bsoncxx-config.cmake.in b/src/bsoncxx/cmake/bsoncxx-config.cmake.in
index 768f3dde6..6dc7f064b 100644
--- a/src/bsoncxx/cmake/bsoncxx-config.cmake.in
+++ b/src/bsoncxx/cmake/bsoncxx-config.cmake.in
@@ -1,3 +1,6 @@
include(CMakeFindDependencyMacro)
@BSONCXX_PKG_DEP@
+if("@Boost_FOUND@")
+ find_dependency(Boost 1.56.0 REQUIRED)
+endif()
include("${CMAKE_CURRENT_LIST_DIR}/bsoncxx_targets.cmake")

View File

@@ -0,0 +1,12 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d1bf5e944..2f7a16aa1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,7 @@
# limitations under the License.
add_definitions(-DMONGO_CXX_DRIVER_COMPILING)
+add_definitions(-D_SCL_SECURE_NO_WARNINGS)
add_subdirectory(bsoncxx)
add_subdirectory(mongocxx)

View File

@@ -0,0 +1,16 @@
diff --git a/src/mongocxx/instance.cpp b/src/mongocxx/instance.cpp
index f12bd84a8..acc570fa9 100644
--- a/src/mongocxx/instance.cpp
+++ b/src/mongocxx/instance.cpp
@@ -75,9 +75,10 @@ typename std::aligned_storage<sizeof(instance), alignof(instance)>::type sentine
std::atomic<instance*> current_instance{nullptr};
static_assert(std::is_standard_layout<decltype(current_instance)>::value,
"Must be standard layout");
+#if (!defined(_MSVC_STL_VERSION))
static_assert(std::is_trivially_destructible<decltype(current_instance)>::value,
"Must be trivially destructible");
-
+#endif
} // namespace
class instance::impl {

View File

@@ -0,0 +1,111 @@
set(VERSION_MAJOR 3)
set(VERSION_MINOR 6)
set(VERSION_PATCH 5)
set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(BSONCXX_STANDARD 11)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mongodb/mongo-cxx-driver
REF r${VERSION_FULL}
SHA512 fe304d2f406f65d79a030dcfd1509543a9ab3057e46328d5ca1fc58da04758b9a2c6666a6194d574f9b42022324972d41c37d00d6fba87dfba63fbfb99e821de
HEAD_REF master
PATCHES
fix-uwp.patch
disable-c2338-mongo-cxx-driver.patch
disable_test_and_example.patch
github-654.patch
fix-dependencies.patch
)
if ("mnmlstc" IN_LIST FEATURES)
if (VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "Feature mnmlstc only supports UNIX")
endif()
set(BSONCXX_POLY MNMLSTC)
elseif ("system-mnmlstc" IN_LIST FEATURES)
message("Please make sure you have mnmlstc installed via the package manager")
set(BSONCXX_POLY SYSTEM_MNMLSTC)
elseif ("boost" IN_LIST FEATURES)
set(BSONCXX_POLY BOOST)
elseif("std-experimental" IN_LIST FEATURES)
set(BSONCXX_POLY STD_EXPERIMENTAL)
set(BSONCXX_STANDARD 17)
else()
if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(BSONCXX_POLY BOOST)
else()
set(BSONCXX_POLY MNMLSTC)
endif()
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DMONGOCXX_HEADER_INSTALL_DIR=include
-DBSONCXX_HEADER_INSTALL_DIR=include
-DBSONCXX_POLY_USE_${BSONCXX_POLY}=1
-DCMAKE_CXX_STANDARD=${BSONCXX_STANDARD}
-DBUILD_VERSION=${VERSION_FULL}
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(PACKAGE_NAME bsoncxx CONFIG_PATH "lib/cmake/bsoncxx-${VERSION_FULL}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(PACKAGE_NAME mongocxx CONFIG_PATH "lib/cmake/mongocxx-${VERSION_FULL}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/libbsoncxx/libbsoncxx-config.cmake"
"
message(WARNING \"This CMake target is deprecated. Use mongo::bsoncxx instead.\")
set(LIBBSONCXX_VERSION_MAJOR ${VERSION_MAJOR})
set(LIBBSONCXX_VERSION_MINOR ${VERSION_MINOR})
set(LIBBSONCXX_VERSION_PATCH ${VERSION_PATCH})
set(LIBBSONCXX_PACKAGE_VERSION ${VERSION_FULL})
include(CMakeFindDependencyMacro)
find_dependency(bsoncxx CONFIG REQUIRED)
get_filename_component(LIBBSONCXX_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/../../include\" ABSOLUTE)
if (TARGET mongo::bsoncxx_shared)
set(LIBBSONCXX_LIBRARIES mongo::bsoncxx_shared)
else()
set(LIBBSONCXX_LIBRARIES mongo::bsoncxx_static)
endif()
"
)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongocxx/libmongocxx-config.cmake
"
message(WARNING \"This CMake target is deprecated. Use mongo::mongocxx instead.\")
set(LIBMONGOCXX_VERSION_MAJOR ${VERSION_MAJOR})
set(LIBMONGOCXX_VERSION_MINOR ${VERSION_MINOR})
set(LIBMONGOCXX_VERSION_PATCH ${VERSION_PATCH})
set(LIBMONGOCXX_PACKAGE_VERSION ${VERSION_FULL})
include(CMakeFindDependencyMacro)
find_dependency(mongocxx CONFIG REQUIRED)
get_filename_component(LIBMONGOCXX_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/../../include\" ABSOLUTE)
if (TARGET mongo::bsoncxx_shared)
set(LIBMONGOCXX_LIBRARIES mongo::mongocxx_shared)
else()
set(LIBMONGOCXX_LIBRARIES mongo::mongocxx_static)
endif()
"
)
vcpkg_fixup_pkgconfig()
if (NOT BSONCXX_POLY STREQUAL MNMLSTC)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party")
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/debug/include"
)
file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/uninstall.sh")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(COPY "${SOURCE_PATH}/THIRD-PARTY-NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

View File

@@ -0,0 +1,37 @@
{
"name": "mongo-cxx-driver",
"version": "3.6.5",
"port-version": 3,
"description": "MongoDB C++ Driver.",
"homepage": "https://github.com/mongodb/mongo-cxx-driver",
"license": "Apache-2.0",
"dependencies": [
"boost-optional",
"boost-smart-ptr",
"boost-utility",
"libbson",
"mongo-c-driver",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"boost": {
"description": "Use Boost C++17 polyfill. The only option under MSVC."
},
"mnmlstc": {
"description": "Use MNMLSTC/core C++17 polyfill."
},
"std-experimental": {
"description": "Use optional and string_view from std::experimental."
},
"system-mnmlstc": {
"description": "Use an available version of MNMLSTC on your system as C++17 polyfill."
}
}
}