зеркало из https://github.com/microsoft/vcpkg.git
[mongo-c-driver] fix static build
This commit is contained in:
Родитель
3eccec7231
Коммит
6947f0aea1
|
@ -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,10 +8,17 @@ 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
|
||||
-DBSON_ROOT_DIR=${CURRENT_INSTALLED_DIR}
|
||||
-DBSON_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
|
||||
-DENABLE_TESTS=OFF
|
||||
-DENABLE_EXAMPLES=OFF
|
||||
-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON
|
||||
|
|
Загрузка…
Ссылка в новой задаче