From ddea3c37b6b36d0cc1228be33e5ed9b176fc262e Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 16 Mar 2024 09:14:21 +0800 Subject: [PATCH] [mongo-cxx-driver] update to 3.10.1 (#37025) --- ports/mongo-cxx-driver/libbsoncxx-config.cmake | 9 --------- ports/mongo-cxx-driver/libmongocxx-config.cmake | 9 --------- ports/mongo-cxx-driver/portfile.cmake | 13 ++----------- ports/mongo-cxx-driver/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mongo-cxx-driver.json | 5 +++++ 6 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 ports/mongo-cxx-driver/libbsoncxx-config.cmake delete mode 100644 ports/mongo-cxx-driver/libmongocxx-config.cmake diff --git a/ports/mongo-cxx-driver/libbsoncxx-config.cmake b/ports/mongo-cxx-driver/libbsoncxx-config.cmake deleted file mode 100644 index 33a3e5aeda..0000000000 --- a/ports/mongo-cxx-driver/libbsoncxx-config.cmake +++ /dev/null @@ -1,9 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(libbsoncxx-static ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG) -set(LIBBSONCXX_VERSION_MAJOR "${LIBBSONCXX_STATIC_VERSION_MAJOR}") -set(LIBBSONCXX_VERSION_MINOR "${LIBBSONCXX_STATIC_VERSION_MINOR}") -set(LIBBSONCXX_VERSION_PATCH "${LIBBSONCXX_STATIC_VERSION_PATCH}") -set(LIBBSONCXX_PACKAGE_VERSION "${LIBBSONCXX_STATIC_PACKAGE_VERSION}") -set(LIBBSONCXX_DEFINITIONS "${LIBBSONCXX_STATIC_DEFINITIONS}") -set(LIBBSONCXX_INCLUDE_DIRS "${LIBBSONCXX_STATIC_INCLUDE_DIRS}") -set(LIBBSONCXX_LIBRARIES "${LIBBSONCXX_STATIC_LIBRARIES}") diff --git a/ports/mongo-cxx-driver/libmongocxx-config.cmake b/ports/mongo-cxx-driver/libmongocxx-config.cmake deleted file mode 100644 index faba20f259..0000000000 --- a/ports/mongo-cxx-driver/libmongocxx-config.cmake +++ /dev/null @@ -1,9 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(libmongocxx-static ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG) -set(LIBMONGOCXX_VERSION_MAJOR "${LIBMONGOCXX_STATIC_VERSION_MAJOR}") -set(LIBMONGOCXX_VERSION_MINOR "${LIBMONGOCXX_STATIC_VERSION_MINOR}") -set(LIBMONGOCXX_VERSION_PATCH "${LIBMONGOCXX_STATIC_VERSION_PATCH}") -set(LIBMONGOCXX_PACKAGE_VERSION "${LIBMONGOCXX_STATIC_PACKAGE_VERSION}") -set(LIBMONGOCXX_DEFINITIONS "${LIBMONGOCXX_STATIC_DEFINITIONS}") -set(LIBMONGOCXX_INCLUDE_DIRS "${LIBMONGOCXX_STATIC_INCLUDE_DIRS}") -set(LIBMONGOCXX_LIBRARIES "${LIBMONGOCXX_STATIC_LIBRARIES}") diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index de8e1752e1..be7798ee3a 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver REF "r${VERSION}" - SHA512 34ff303d496dd2c9b8cada16dc215c40fddccfe660bdc7fe59c92449861876b820c3ea4e3e5c91029e0322411bbe98a11cb1f3fa046b028d92d3c9a3509ce988 + SHA512 cc09ccbb926b1f00ebd9ead5afda150d0d8a8619c2439f8a9bc01a1f49ebfc0cee91ca2019d97a883a469a8594961b5b74fcc06525dce38461e2003a9f1894c4 HEAD_REF master PATCHES fix-dependencies.patch @@ -38,16 +38,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(PACKAGE_NAME "bsoncxx" CONFIG_PATH "lib/cmake/bsoncxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(PACKAGE_NAME "mongocxx" CONFIG_PATH "lib/cmake/mongocxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_cmake_config_fixup(PACKAGE_NAME "libbsoncxx-static" CONFIG_PATH "lib/cmake/libbsoncxx-static-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libbsoncxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libbsoncxx") - vcpkg_cmake_config_fixup(PACKAGE_NAME "libmongocxx-static" CONFIG_PATH "lib/cmake/libmongocxx-static-${VERSION}") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libmongocxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libmongocxx") -else() - vcpkg_cmake_config_fixup(PACKAGE_NAME "libbsoncxx" CONFIG_PATH "lib/cmake/libbsoncxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) - vcpkg_cmake_config_fixup(PACKAGE_NAME "libmongocxx" CONFIG_PATH "lib/cmake/libmongocxx-${VERSION}") -endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME "mongocxx" CONFIG_PATH "lib/cmake/mongocxx-${VERSION}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 4cc9f79cf5..7fab486e76 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-cxx-driver", - "version": "3.9.0", + "version": "3.10.1", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2fe7c659f8..8638bce504 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5781,7 +5781,7 @@ "port-version": 0 }, "mongo-cxx-driver": { - "baseline": "3.9.0", + "baseline": "3.10.1", "port-version": 0 }, "mongoose": { diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index fe043b3f17..1b3bda65b2 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1cb201479398cab55eb19e2010472c4f35b1fa50", + "version": "3.10.1", + "port-version": 0 + }, { "git-tree": "9682855a28fdd67511a8b454e361f4a7841584a8", "version": "3.9.0",