[libbson] [mongo-c-driver] [mongo-cxx-driver] Update to latest (1.6.2/1.6.2/3.1.1)

This commit is contained in:
Robert Schumacher 2017-04-13 19:00:15 -07:00
parent bfb76e52a4
commit 0074703e9a
7 changed files with 28 additions and 28 deletions

View File

@ -1,3 +1,3 @@
Source: libbson
Version: 1.5.1-3
Version: 1.6.2
Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.

View File

@ -1,10 +1,10 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.5.1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.6.2)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/mongodb/libbson/archive/1.5.1.tar.gz"
FILENAME "libbson-1.5.1.tar.gz"
SHA512 b641e23ca041e532fe566167ad0292d12934e0fae2c110f81bf6ca3b71b5d01b651a604a7ce6da0d1b54b98cd95674ef331ef4e23c2dedfc706f371eac4efaec
URLS "https://github.com/mongodb/libbson/archive/1.6.2.tar.gz"
FILENAME "libbson-1.6.2.tar.gz"
SHA512 c5848984d5db5ab62e698a0185139b20834d83fd7befef72336997097f639ef13e81053531385e96c7ba1fe3f3fe4ded517f5b8ee58f0914c5c807a9cb43766d
)
vcpkg_extract_source_archive(${ARCHIVE})

View File

@ -1,4 +1,4 @@
Source: mongo-c-driver
Version: 1.5.1-1
Version: 1.6.2
Build-Depends: libbson, openssl [uwp]
Description: Client library written in C for MongoDB.

View File

@ -1,24 +1,23 @@
diff --git a/build/cmake/FindBSON.cmake b/build/cmake/FindBSON.cmake
index 4ac39ea..d11aa1f 100644
index 06fd82e..3ac549d 100644
--- a/build/cmake/FindBSON.cmake
+++ b/build/cmake/FindBSON.cmake
@@ -12,6 +12,7 @@ endif ()
@@ -11,15 +11,15 @@ endif ()
find_path(BSON_INCLUDE_DIR
NAMES
libbson-1.0/bson.h
+ bson.h
- libbson-1.0/bson.h
+ bson.h
HINTS
${BSON_ROOT_DIR}
${_BSON_INCLUDEDIR}
@@ -19,7 +20,10 @@ find_path(BSON_INCLUDE_DIR
PATH_SUFFIXES
include
+ libbson-1.0
+ include/libbson-1.0
)
-set(BSON_INCLUDE_DIR "${BSON_INCLUDE_DIR}/libbson-1.0")
+set(BSON_INCLUDE_DIR "${BSON_INCLUDE_DIR}")
+if (NOT EXISTS ${BSON_INCLUDE_DIR}/bson.h)
+ set(BSON_INCLUDE_DIR "${BSON_INCLUDE_DIR}/libbson-1.0")
+endif()
if(WIN32 AND NOT CYGWIN)
if(MSVC)
-
find_library(BSON
NAMES
"bson-1.0"

View File

@ -1,15 +1,16 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.5.1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.6.2)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/mongodb/mongo-c-driver/archive/1.5.1.tar.gz"
FILENAME "mongo-c-driver-1.5.1.tar.gz"
SHA512 2977e6e1fb3c45256161d2c9bd711fea69b9f8c9ff15362fa636068e0a347c42e10d72fed5649504b552c8212f21cb1ae74d2dc8ca3d1388f49e63b2baf6e16d
URLS "https://github.com/mongodb/mongo-c-driver/archive/1.6.2.tar.gz"
FILENAME "mongo-c-driver-1.6.2.tar.gz"
SHA512 3533fed665c70b71f0e9473156bab1575f60b0b3db412f19c0a625e1e35683a3077f96b8a0ba337fd755675029f47b68dc3a5fc8f39254bb0be589da57cffad3
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
PATCHES
${CMAKE_CURRENT_LIST_DIR}/bson.patch
${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch

View File

@ -1,4 +1,4 @@
Source: mongo-cxx-driver
Version: 3.0.3-2
Version: 3.1.1
Build-Depends: boost, libbson, mongo-c-driver
Description: MongoDB C++ Driver.

View File

@ -1,10 +1,10 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.1.0)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.1.1)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/mongodb/mongo-cxx-driver/archive/r3.1.0.tar.gz"
FILENAME "mongo-cxx-driver-r3.1.0.tar.gz"
SHA512 2c9323f5e28304057b6ed6fc8bf33aad14db1313e234eaa74a96fb4cf93e99d24fd8c7c3f20b4b29cda7b1fe5c58f08dcb5cddcffbf62259c08334312fda4fba
URLS "https://github.com/mongodb/mongo-cxx-driver/archive/r3.1.1.tar.gz"
FILENAME "mongo-cxx-driver-r3.1.1.tar.gz"
SHA512 ba8a735e5645cbce4497df71a4577e891d507f577dbd5270ec8a82e54c39c2806bf2ff4848b621f18b36d31fb6031e5b4211972b661c43009bff0ed7ab6cf338
)
vcpkg_extract_source_archive(${ARCHIVE})