mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 04:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[mongo-cxx-driver] using BUILD_SHARED_LIBS instead of self-defined macro.

Browse Source 
related to: https://github.com/Microsoft/vcpkg/pull/316
This commit is contained in:
sdcb 2016-11-23 10:11:17 +08:00
parent c4af751534
commit a26bf41ac3
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/mongo-cxx-driver/disable_shared.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
index a9a7ada..f4534b1 100644
index a9a7ada..6b87a6d 100644
--- a/src/bsoncxx/CMakeLists.txt
+++ b/src/bsoncxx/CMakeLists.txt
@@ -117,9 +117,15 @@ if (WIN32)
@ -9,7 +9,7 @@ index a9a7ada..f4534b1 100644
-add_library(bsoncxx SHARED
- ${bsoncxx_sources}
-)
+if(ENABLE_SHARED)
+if(BUILD_SHARED_LIBS)
+ add_library(bsoncxx SHARED
+ ${bsoncxx_sources}
+ )
@ -22,7 +22,7 @@ index a9a7ada..f4534b1 100644
set(bsoncxx_libs ${LIBBSON_LIBRARIES})
diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
index 2ef54e4..a2c8ca4 100644
index 2ef54e4..53a13f7 100644
--- a/src/mongocxx/CMakeLists.txt
+++ b/src/mongocxx/CMakeLists.txt
@@ -134,9 +134,15 @@ set_target_properties(mongocxx_mocked PROPERTIES
@ -32,7 +32,7 @@ index 2ef54e4..a2c8ca4 100644
-add_library(mongocxx SHARED
- ${mongocxx_sources}
-)
+if(ENABLE_SHARED)
+if(BUILD_SHARED_LIBS)
+ add_library(mongocxx SHARED
+ ${mongocxx_sources}
+ )

5
ports/mongo-cxx-driver/portfile.cmake
View File

@ -15,17 +15,12 @@ vcpkg_apply_patches(
${CMAKE_CURRENT_LIST_DIR}/disable_shared.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(ENABLE_SHARED ON)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DLIBBSON_DIR=${CURRENT_INSTALLED_DIR}
-DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR}
-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON
-DENABLE_SHARED=${ENABLE_SHARED}
)
vcpkg_install_cmake()