From e7ad48b0b85d1116f00379e61d3ceb1f58016fdb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 6 Apr 2017 16:52:44 -0700 Subject: [mongo-cxx-driver] Fix UWP builds. Deploy THIRD-PARTY-NOTICES. --- ports/mongo-cxx-driver/CONTROL | 4 ++-- ports/mongo-cxx-driver/fix-uwp.patch | 11 +++++++++++ ports/mongo-cxx-driver/portfile.cmake | 6 +++++- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 ports/mongo-cxx-driver/fix-uwp.patch 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 -- cgit v1.2.3