diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-13 19:00:15 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-13 19:00:15 -0700 |
| commit | 0074703e9a253490ea39e60da53628190b755552 (patch) | |
| tree | cfbc8e541ed6cff8bad5107a4599de44e256a3d6 /ports/mongo-c-driver | |
| parent | bfb76e52a4fabf18301ccecd778dbd47ef06f930 (diff) | |
| download | vcpkg-0074703e9a253490ea39e60da53628190b755552.tar.gz vcpkg-0074703e9a253490ea39e60da53628190b755552.zip | |
[libbson] [mongo-c-driver] [mongo-cxx-driver] Update to latest (1.6.2/1.6.2/3.1.1)
Diffstat (limited to 'ports/mongo-c-driver')
| -rw-r--r-- | ports/mongo-c-driver/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mongo-c-driver/bson.patch | 25 | ||||
| -rw-r--r-- | ports/mongo-c-driver/portfile.cmake | 9 |
3 files changed, 18 insertions, 18 deletions
diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index f509493ee..8d77eeca5 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -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.
\ No newline at end of file diff --git a/ports/mongo-c-driver/bson.patch b/ports/mongo-c-driver/bson.patch index 83291d699..6ef5451b8 100644 --- a/ports/mongo-c-driver/bson.patch +++ b/ports/mongo-c-driver/bson.patch @@ -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" diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 0cdb9611b..4376f324a 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -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
|