Merge pull request #499 from sdcb/mongo-c-static-fix

[mongo-c-driver] fix static build
This commit is contained in:
Alexander Karatarakis 2017-01-10 13:38:21 -08:00 committed by GitHub
commit 1921dbe3f9
2 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,24 @@
diff --git a/build/cmake/FindBSON.cmake b/build/cmake/FindBSON.cmake
index 4ac39ea..d11aa1f 100644
--- a/build/cmake/FindBSON.cmake
+++ b/build/cmake/FindBSON.cmake
@@ -12,6 +12,7 @@ endif ()
find_path(BSON_INCLUDE_DIR
NAMES
libbson-1.0/bson.h
+ bson.h
HINTS
${BSON_ROOT_DIR}
${_BSON_INCLUDEDIR}
@@ -19,7 +20,10 @@ find_path(BSON_INCLUDE_DIR
include
)
-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)

View File

@ -8,6 +8,12 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/bson.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS