Upgrade libbson to 1.5.0-rc6

Add support for libbson-static build.
Do not use the patch file for libbson.
This commit is contained in:
sdcb 2016-11-21 11:19:08 +08:00
parent b706e4b93a
commit 2538bdac5a
3 changed files with 26 additions and 51 deletions

View File

@ -1,35 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d09a298..e64a6cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,6 @@ include(CheckIncludeFile)
include(CheckStructHasMember)
include(CheckSymbolExists)
include(TestBigEndian)
-include(InstallRequiredSystemLibraries)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/build/cmake)
@@ -47,13 +46,6 @@ TEST_BIG_ENDIAN(BSON_BIG_ENDIAN)
set (BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES 0)
set (BSON_HAVE_DECIMAL128 0)
-#librt needed on linux for clock_gettime
-find_library(RT_LIBRARY rt)
-if (RT_LIBRARY)
- #set required libraries for CHECK_FUNCTION_EXISTS
- set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
-endif()
-
# See https://public.kitware.com/Bug/view.php?id=15659
CHECK_SYMBOL_EXISTS(snprintf stdio.h BSON_HAVE_SNPRINTF)
if (NOT BSON_HAVE_SNPRINTF)
@@ -314,7 +306,7 @@ install(
)
install(
FILES ${HEADERS}
- DESTINATION "include/libbson-${BSON_API_VERSION}"
+ DESTINATION "include"
)
set(VERSION "${BSON_VERSION}")

View File

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

View File

@ -1,28 +1,38 @@
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.4.2)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.5.0-rc6)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/mongodb/libbson/releases/download/1.4.2/libbson-1.4.2.tar.gz"
FILENAME "libbson-1.4.2.tar.gz"
SHA512 4cc8f833978483af3dcbc30bede33f2a9b448930fabf7be2d5581c8368e875dc1707d31eae209c747e69be1f82fa525c7362c5ac9c4e0b6b3f3346dd5147860e
URLS "https://github.com/mongodb/libbson/archive/1.5.0-rc6.tar.gz"
FILENAME "libbson-1.5.0-rc6.tar.gz"
SHA512 15cf590b488f7de8d614ddcc2c1536b05b607311f3cd3353418469c7a62177124fb4fb1c53f51b0de4c7491b21051c1ec47fbc12856cc69e37baebb3d65897c5
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DENABLE_TESTS=OFF
-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON
)
vcpkg_install_cmake()
file(RENAME
${CURRENT_PACKAGES_DIR}/include/libbson-1.0
${CURRENT_PACKAGES_DIR}/temp)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include)
file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson/COPYING ${CURRENT_PACKAGES_DIR}/share/libbson/copyright)
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/bson-1.0.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bson-1.0.lib)
else()
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/bson-static-1.0.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bson-static-1.0.lib)
endif()
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson RENAME copyright)