aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Chenxin <chenxinleo@163.com>2021-08-03 07:59:18 +0800
committerGitHub <noreply@github.com>2021-08-02 16:59:18 -0700
commita863c84812089836a3c0f2f215ab3e2579fc8acf (patch)
tree44cf0965f0f7fcb9af68ecc585bf6d33e694a1b3
parenta6ef376f0d757c8b695b12f53d573f99a524e594 (diff)
downloadvcpkg-a863c84812089836a3c0f2f215ab3e2579fc8acf.tar.gz
vcpkg-a863c84812089836a3c0f2f215ab3e2579fc8acf.zip
[protobuf] add support for mingw subsystem (#19054)
* [protobuf] add support for mingw subsystem * [protobuf] support for mingw * Update the port version * Update the baseline version Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
-rw-r--r--ports/protobuf/portfile.cmake2
-rw-r--r--ports/protobuf/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/p-/protobuf.json5
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 8f7c3b119..a645866c9 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -76,7 +76,7 @@ endif()
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share)
if(protobuf_BUILD_PROTOC_BINARIES)
- if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
+ if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN)
else()
vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.15.8.0 AUTO_CLEAN)
diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index 0e85e376c..40b557dd3 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "protobuf",
"version-semver": "3.15.8",
- "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 ebf427171..23329bde0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5054,7 +5054,7 @@
},
"protobuf": {
"baseline": "3.15.8",
- "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 547ba83f2..bc2dcdead 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "6204194eaf9d8ff0fe78d498f77fee57cd19ce59",
+ "version-semver": "3.15.8",
+ "port-version": 4
+ },
+ {
"git-tree": "88066eeef097b56edc3bff316ce292d57c132d12",
"version-semver": "3.15.8",
"port-version": 3