From 94c2aed904810b4488a78eb6cf5b884f7906e9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= Date: Fri, 15 Apr 2022 16:29:29 -0400 Subject: [PATCH] [mongo-cxx-driver] set c++17 for std::experimental build (#24083) * [mongo-cxx-driver] set c++17 for std::experimental build fixes #21877 * update version * update git-tree * add license * overwrite version Co-authored-by: FrankXie --- ports/mongo-cxx-driver/portfile.cmake | 3 +++ ports/mongo-cxx-driver/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/m-/mongo-cxx-driver.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index 1b208519e9..4b03c74d33 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -2,6 +2,7 @@ set(VERSION_MAJOR 3) set(VERSION_MINOR 6) set(VERSION_PATCH 5) set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +set(BSONCXX_STANDARD 11) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -29,6 +30,7 @@ elseif ("boost" IN_LIST FEATURES) set(BSONCXX_POLY BOOST) elseif("std-experimental" IN_LIST FEATURES) set(BSONCXX_POLY STD_EXPERIMENTAL) + set(BSONCXX_STANDARD 17) else() if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(BSONCXX_POLY BOOST) @@ -43,6 +45,7 @@ vcpkg_cmake_configure( -DMONGOCXX_HEADER_INSTALL_DIR=include -DBSONCXX_HEADER_INSTALL_DIR=include -DBSONCXX_POLY_USE_${BSONCXX_POLY}=1 + -DCMAKE_CXX_STANDARD=${BSONCXX_STANDARD} -DBUILD_VERSION=${VERSION_FULL} ) diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 6b0216a30f..c76a2a49a2 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mongo-cxx-driver", "version": "3.6.5", - "port-version": 2, + "port-version": 3, "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", + "license": "Apache-2.0", "dependencies": [ "boost-optional", "boost-smart-ptr", diff --git a/versions/baseline.json b/versions/baseline.json index 6e5da63137..41fd03f764 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4578,7 +4578,7 @@ }, "mongo-cxx-driver": { "baseline": "3.6.5", - "port-version": 2 + "port-version": 3 }, "mongoose": { "baseline": "7.5", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 4510acc815..38482de4ae 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "732830e44f7d4c9c31025d6c77e7d40220abef38", + "version": "3.6.5", + "port-version": 3 + }, { "git-tree": "2c9183634ff53b6e76b201ad39abf63b5d26bc8a", "version": "3.6.5",