diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-06 16:18:05 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-06 16:18:05 -0800 |
| commit | b6f18a90e22d33019724d39db67ee72d58b5c864 (patch) | |
| tree | f4cecc2770c48e0831638850c847a47edb35cce1 /ports/libbson | |
| parent | d1ea0ce9367e6107631ca2252dc3ed2b1e67e7ee (diff) | |
| parent | 63c1b2628e958f8e02356411f032941c0c2f3bbb (diff) | |
| download | vcpkg-b6f18a90e22d33019724d39db67ee72d58b5c864.tar.gz vcpkg-b6f18a90e22d33019724d39db67ee72d58b5c864.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4898
Diffstat (limited to 'ports/libbson')
| -rw-r--r-- | ports/libbson/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libbson/portfile.cmake | 19 |
2 files changed, 9 insertions, 12 deletions
diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL index 8ba25697f..2d64c4c1c 100644 --- a/ports/libbson/CONTROL +++ b/ports/libbson/CONTROL @@ -1,3 +1,3 @@ Source: libbson -Version: 1.9.2 +Version: 1.9.5-1 Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents. diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 45bc06170..50b6da175 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,15 +1,11 @@ include(vcpkg_common_functions)
-set(LIBBSON_VERSION 1.9.2)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/mongodb/libbson/archive/${LIBBSON_VERSION}.tar.gz"
- FILENAME "libbson-${LIBBSON_VERSION}.tar.gz"
- SHA512 a05f1e8fbabb34e847692397e2e41fc5923ddd18dba861e5ab8a31acdf6738e13ab719eae8f9f8563f08fc43aab5c8d1f53cb6a47c38c96e132fa4a62a48d2bf
-)
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
- REF ${LIBBSON_VERSION}
+ REPO mongodb/libbson
+ REF 1.9.5
+ SHA512 14bc75989baac550f42939ea161fa7872b950e5b669dc8f19e897f0783b04e0212e5e722b3fcdf946308b9a68bc066502ed8238dad92e342e5f49b8b2cc8f484
+ HEAD_REF master
PATCHES fix-uwp.patch
)
@@ -70,7 +66,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
endif()
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson RENAME copyright)
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libbson/copyright COPYONLY)
file(COPY ${SOURCE_PATH}/THIRD_PARTY_NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson)
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -79,6 +75,7 @@ else() set(PORT_POSTFIX "1.0")
endif()
+# Create cmake files for _both_ find_package(libbson) and find_package(libbson-static-1.0)/find_package(libbson-1.0)
file(READ ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config.cmake LIBBSON_CONFIG_CMAKE)
string(REPLACE "/include/libbson-1.0" "/include" LIBBSON_CONFIG_CMAKE "${LIBBSON_CONFIG_CMAKE}")
string(REPLACE "bson-static-1.0" "bson-1.0" LIBBSON_CONFIG_CMAKE "${LIBBSON_CONFIG_CMAKE}")
@@ -88,4 +85,4 @@ file(COPY ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config-v file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config.cmake ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-config.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-${PORT_POSTFIX}-config-version.cmake ${CURRENT_PACKAGES_DIR}/share/libbson/libbson-config-version.cmake)
-vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs()
|