aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-04-06 16:52:44 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-04-06 16:52:44 -0700
commite7ad48b0b85d1116f00379e61d3ceb1f58016fdb (patch)
tree6872bbe46a6f7d561c9aae6e9c0455da72c99abc
parent0163b19e32f07ec8964fa89f9ceb522c3a45b4ec (diff)
downloadvcpkg-e7ad48b0b85d1116f00379e61d3ceb1f58016fdb.tar.gz
vcpkg-e7ad48b0b85d1116f00379e61d3ceb1f58016fdb.zip
[mongo-cxx-driver] Fix UWP builds. Deploy THIRD-PARTY-NOTICES.
-rw-r--r--ports/mongo-cxx-driver/CONTROL4
-rw-r--r--ports/mongo-cxx-driver/fix-uwp.patch11
-rw-r--r--ports/mongo-cxx-driver/portfile.cmake6
3 files changed, 18 insertions, 3 deletions
diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL
index 57c400bed..ba3b1c7e0 100644
--- a/ports/mongo-cxx-driver/CONTROL
+++ b/ports/mongo-cxx-driver/CONTROL
@@ -1,4 +1,4 @@
Source: mongo-cxx-driver
-Version: 3.0.3-1
-Build-Depends: boost,libbson,mongo-c-driver
+Version: 3.0.3-2
+Build-Depends: boost, libbson, mongo-c-driver
Description: MongoDB C++ Driver. \ No newline at end of file
diff --git a/ports/mongo-cxx-driver/fix-uwp.patch b/ports/mongo-cxx-driver/fix-uwp.patch
new file mode 100644
index 000000000..fffaa8337
--- /dev/null
+++ b/ports/mongo-cxx-driver/fix-uwp.patch
@@ -0,0 +1,11 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 40cd480..08cd37f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -13,5 +13,6 @@
+ # limitations under the License.
+
+ add_definitions(-DMONGO_CXX_DRIVER_COMPILING)
++add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+ add_subdirectory(bsoncxx)
+ add_subdirectory(mongocxx)
diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake
index 4f3ed9dca..e024c9a21 100644
--- a/ports/mongo-cxx-driver/portfile.cmake
+++ b/ports/mongo-cxx-driver/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_apply_patches(
PATCHES
${CMAKE_CURRENT_LIST_DIR}/disable_test_and_example.patch
${CMAKE_CURRENT_LIST_DIR}/disable_shared.patch
+ ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch
)
vcpkg_configure_cmake(
@@ -85,4 +86,7 @@ else()
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib)
endif()
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-cxx-driver RENAME copyright) \ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-cxx-driver RENAME copyright)
+file(COPY ${SOURCE_PATH}/THIRD-PARTY-NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-cxx-driver)
+
+vcpkg_copy_pdbs() \ No newline at end of file