From 59e3243c9911d1f736ac39c17a77a92fa2b9cddc Mon Sep 17 00:00:00 2001
From: bucurb <bobuc@microsoft.com>
Date: Thu, 1 Jul 2021 17:10:50 +0100
Subject: [PATCH] [protobuf] Fixed protoc path (#18741)

* fixed protoc path

* bumped version
---
 ports/protobuf/vcpkg-cmake-wrapper.cmake | 2 +-
 ports/protobuf/vcpkg.json                | 2 +-
 versions/baseline.json                   | 2 +-
 versions/p-/protobuf.json                | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/protobuf/vcpkg-cmake-wrapper.cmake b/ports/protobuf/vcpkg-cmake-wrapper.cmake
index 542a16c2b8a..7269aedcca5 100644
--- a/ports/protobuf/vcpkg-cmake-wrapper.cmake
+++ b/ports/protobuf/vcpkg-cmake-wrapper.cmake
@@ -11,6 +11,6 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
     cmake_policy(POP)
 endif()
 
-find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH)
+find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../tools/protobuf" NO_DEFAULT_PATH)
 
 _find_package(${ARGS})
diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index 5f1926a088e..0e85e376c0c 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "protobuf",
   "version-semver": "3.15.8",
-  "port-version": 2,
+  "port-version": 3,
   "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 023cb4347bb..f35a73e2a22 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4986,7 +4986,7 @@
     },
     "protobuf": {
       "baseline": "3.15.8",
-      "port-version": 2
+      "port-version": 3
     },
     "protobuf-c": {
       "baseline": "1.3.2-2",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index 7ce8bc35fdf..547ba83f2e6 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88066eeef097b56edc3bff316ce292d57c132d12",
+      "version-semver": "3.15.8",
+      "port-version": 3
+    },
     {
       "git-tree": "1c52c3eb43c2dfd9603673eb5c173ec69c21ea73",
       "version-semver": "3.15.8",