mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 11:09:00 +08:00
44 lines
1.0 KiB
Diff
44 lines
1.0 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b3fc5b9..5a106ca 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -20,7 +20,6 @@ option(ENABLE_EXPERIMENTAL_FEATURES
|
|
|
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/build/cmake)
|
|
|
|
-include(InstallRequiredSystemLibraries)
|
|
include(FindBSON REQUIRED)
|
|
|
|
if (NOT (ENABLE_SSL STREQUAL DARWIN
|
|
@@ -563,7 +562,7 @@ install(
|
|
)
|
|
install(
|
|
FILES ${HEADERS}
|
|
- DESTINATION "include/libmongoc-${MONGOC_API_VERSION}"
|
|
+ DESTINATION "include"
|
|
)
|
|
|
|
# Define pkg-config files
|
|
diff --git a/build/cmake/FindBSON.cmake b/build/cmake/FindBSON.cmake
|
|
index 4ac39ea..bf6ecab 100644
|
|
--- a/build/cmake/FindBSON.cmake
|
|
+++ b/build/cmake/FindBSON.cmake
|
|
@@ -11,7 +11,7 @@ endif ()
|
|
|
|
find_path(BSON_INCLUDE_DIR
|
|
NAMES
|
|
- libbson-1.0/bson.h
|
|
+ bson.h
|
|
HINTS
|
|
${BSON_ROOT_DIR}
|
|
${_BSON_INCLUDEDIR}
|
|
@@ -19,8 +19,6 @@ find_path(BSON_INCLUDE_DIR
|
|
include
|
|
)
|
|
|
|
-set(BSON_INCLUDE_DIR "${BSON_INCLUDE_DIR}/libbson-1.0")
|
|
-
|
|
if(WIN32 AND NOT CYGWIN)
|
|
if(MSVC)
|
|
find_library(BSON
|