From 4fb865b8b763fe149cf3af0598f0cd80a4686d53 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 2 Apr 2021 01:32:41 +0800 Subject: [protobuf] Fix deprecation warning in vcpkg_check_feature() (#16997) * [protobuf] Fix deprecation warning in vcpkg_check_feature() * Update versions * Update keyword * Update versions/p-/protobuf.json --- ports/protobuf/portfile.cmake | 3 ++- ports/protobuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 174b9617e..4628f5636 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -14,7 +14,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" protobuf_BUILD_SHARED_ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" protobuf_MSVC_STATIC_RUNTIME) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - zlib protobuf_WITH_ZLIB + FEATURES + zlib protobuf_WITH_ZLIB ) if(VCPKG_TARGET_IS_UWP) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index a33f12a64..d69019b82 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "protobuf", "version-string": "3.14.0", - "port-version": 3, + "port-version": 4, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 02e8935db..371438908 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4846,7 +4846,7 @@ }, "protobuf": { "baseline": "3.14.0", - "port-version": 3 + "port-version": 4 }, "protobuf-c": { "baseline": "1.3.2-2", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index 20c3397f5..2c5861a4d 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d60f4db7f63f55aa3b9be8c8848f2d492cab577f", + "version-string": "3.14.0", + "port-version": 4 + }, { "git-tree": "9f8c80db7cf8a925199facba3ba0c6c8436c41c8", "version-string": "3.14.0", -- cgit v1.2.3