mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 22:19:00 +08:00
Merge pull request #499 from sdcb/mongo-c-static-fix
[mongo-c-driver] fix static build
This commit is contained in:
commit
1921dbe3f9
24
ports/mongo-c-driver/bson.patch
Normal file
24
ports/mongo-c-driver/bson.patch
Normal 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)
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user