diff --git a/overlay_ports/mongo-cxx-driver/cmake-project-include.cmake b/overlay_ports/mongo-cxx-driver/cmake-project-include.cmake deleted file mode 100644 index 4c4f5b09e6..0000000000 --- a/overlay_ports/mongo-cxx-driver/cmake-project-include.cmake +++ /dev/null @@ -1,4 +0,0 @@ -if(BSONCXX_POLY_USE_STD AND NOT CMAKE_CXX_STANDARD VERSION_GREATER_EQUAL "17") - message(WARNING "Enabling C++17 compiler support.") - set(CMAKE_CXX_STANDARD 17) -endif() diff --git a/overlay_ports/mongo-cxx-driver/fix-dependencies.patch b/overlay_ports/mongo-cxx-driver/fix-dependencies.patch deleted file mode 100644 index 2e6dd14d56..0000000000 --- a/overlay_ports/mongo-cxx-driver/fix-dependencies.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index 1e241f5..adf9a27 100644 ---- a/src/bsoncxx/CMakeLists.txt -+++ b/src/bsoncxx/CMakeLists.txt -@@ -105,7 +105,7 @@ else() - else() - # Require package of old libbson name (with lib). - if(NOT BSONCXX_LINK_WITH_STATIC_MONGOC) -- find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} ${LIBBSON_REQUIRED_VERSION} REQUIRED) -+ find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} REQUIRED) - message(STATUS "found libbson version ${BSON_VERSION}") - set(libbson_target ${BSON_LIBRARIES}) - set(libbson_include_directories ${BSON_INCLUDE_DIRS}) -diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt -index 4fe323f..2e27410 100644 ---- a/src/mongocxx/CMakeLists.txt -+++ b/src/mongocxx/CMakeLists.txt -@@ -41,7 +41,7 @@ if(TARGET mongoc_shared OR TARGET mongoc_static) - set(MONGOCXX_PKG_DEP "find_dependency(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} REQUIRED)") - else() - # Attempt to find libmongoc by new package name (without lib). -- find_package(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} ${LIBMONGOC_REQUIRED_VERSION} QUIET) -+ find_package(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} CONFIG REQUIRED) - - if(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION}_FOUND) - message(STATUS "found libmongoc version ${mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION}_VERSION}") -@@ -56,7 +56,7 @@ else() - else() - # Require package of old libmongoc name (with lib). - if(NOT MONGOCXX_LINK_WITH_STATIC_MONGOC) -- find_package(libmongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} ${LIBMONGOC_REQUIRED_VERSION} REQUIRED) -+ find_package(libmongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} REQUIRED) - message(STATUS "found libmongoc version ${MONGOC_VERSION}") - set(libmongoc_target ${MONGOC_LIBRARIES}) - set(libmongoc_definitions ${MONGOC_DEFINITIONS}) diff --git a/overlay_ports/mongo-cxx-driver/portfile.cmake b/overlay_ports/mongo-cxx-driver/portfile.cmake deleted file mode 100644 index 6d1d0e8ec1..0000000000 --- a/overlay_ports/mongo-cxx-driver/portfile.cmake +++ /dev/null @@ -1,67 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mongodb/mongo-cxx-driver - REF "aa0b94c2c33b1df06b22c777a78149f4e7c70b2b" - SHA512 6980c50245c2bcdce4d4b97497dea31dc1a85b39ff0e6a2a971bd0033d6adf7af829e994f82da84ef74aadf1f1b3f6fe1fd404d7c4d1b38c950226f5cdb81e8e - HEAD_REF master - PATCHES - fix-dependencies.patch -) -file(WRITE "${SOURCE_PATH}/build/VERSION_CURRENT" "${VERSION}") - -# This port offered C++17 ABI alternative via features. -# This was reduced to boost only. -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - boost BSONCXX_POLY_USE_BOOST - INVERTED_FEATURES - boost BSONCXX_POLY_USE_STD - boost CMAKE_DISABLE_FIND_PACKAGE_Boost -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - "-DCMAKE_PROJECT_MONGO_CXX_DRIVER_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" - -DBSONCXX_HEADER_INSTALL_DIR=include - -DENABLE_TESTS=OFF - -DENABLE_UNINSTALL=OFF - -DMONGOCXX_HEADER_INSTALL_DIR=include - -DNEED_DOWNLOAD_C_DRIVER=OFF - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_Boost - BSONCXX_HEADER_INSTALL_DIR - MONGOCXX_HEADER_INSTALL_DIR -) -vcpkg_cmake_install() -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}") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" -) - -function(auto_clean dir) - file(GLOB entries "${dir}/*") - file(GLOB files LIST_DIRECTORIES false "${dir}/*") - foreach(entry IN LISTS entries) - if(entry IN_LIST files) - continue() - endif() - file(GLOB_RECURSE children "${entry}/*") - if(children) - auto_clean("${entry}") - else() - file(REMOVE_RECURSE "${entry}") - endif() - endforeach() -endfunction() -auto_clean("${CURRENT_PACKAGES_DIR}/include") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/overlay_ports/mongo-cxx-driver/usage b/overlay_ports/mongo-cxx-driver/usage deleted file mode 100644 index f02fb8196d..0000000000 --- a/overlay_ports/mongo-cxx-driver/usage +++ /dev/null @@ -1,7 +0,0 @@ -mongo-cxx-driver provides CMake targets: - - find_package(bsoncxx CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,mongo::bsoncxx_static,mongo::bsoncxx_shared>) - - find_package(mongocxx CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,mongo::mongocxx_static,mongo::mongocxx_shared>) diff --git a/overlay_ports/mongo-cxx-driver/vcpkg.json b/overlay_ports/mongo-cxx-driver/vcpkg.json deleted file mode 100644 index 45bdc2e066..0000000000 --- a/overlay_ports/mongo-cxx-driver/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "mongo-cxx-driver", - "version": "3.10.2", - "description": "MongoDB C++ Driver.", - "homepage": "https://github.com/mongodb/mongo-cxx-driver", - "license": "Apache-2.0", - "dependencies": [ - "libbson", - "mongo-c-driver", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "boost": { - "description": [ - "Enables the Boost C++17 polyfill for bsoncxx.", - "Warning: This feature changes the ABI." - ], - "dependencies": [ - "boost-optional", - "boost-smart-ptr", - "boost-utility" - ] - } - } -} diff --git a/vcpkg b/vcpkg index 5a3e638f44..7d62e41f58 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 5a3e638f449206ac10f82f2171a21333004d7306 +Subproject commit 7d62e41f582b187bef9d09497aee275337b93e9c