diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-01-10 13:38:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 13:38:21 -0800 |
| commit | 1921dbe3f90ccf9ebb5f4087fc2b923768c48699 (patch) | |
| tree | 4ea3bc8cba6516be2256e0464a0597e6e7656733 | |
| parent | e44a7e611bc5d135071e175c458b446965598c56 (diff) | |
| parent | aa964e8d847a093b9a39bf973b915f51e7fcf091 (diff) | |
| download | vcpkg-1921dbe3f90ccf9ebb5f4087fc2b923768c48699.tar.gz vcpkg-1921dbe3f90ccf9ebb5f4087fc2b923768c48699.zip | |
Merge pull request #499 from sdcb/mongo-c-static-fix
[mongo-c-driver] fix static build
| -rw-r--r-- | ports/mongo-c-driver/bson.patch | 24 | ||||
| -rw-r--r-- | ports/mongo-c-driver/portfile.cmake | 6 |
2 files changed, 30 insertions, 0 deletions
diff --git a/ports/mongo-c-driver/bson.patch b/ports/mongo-c-driver/bson.patch new file mode 100644 index 000000000..83291d699 --- /dev/null +++ b/ports/mongo-c-driver/bson.patch @@ -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) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 833d7393c..3d551e084 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -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
|