3 files changed, 54 insertions, 2 deletions
diff --git a/ports/google-cloud-cpp/disable-benchmarks.patch b/ports/google-cloud-cpp/disable-benchmarks.patch
new file mode 100644
index 000000000..966cb1733
--- /dev/null
+++ b/ports/google-cloud-cpp/disable-benchmarks.patch
@@ -0,0 +1,43 @@
+diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
+index d68ae2a..99ec4c2 100644
+--- a/generator/CMakeLists.txt
++++ b/generator/CMakeLists.txt
+@@ -150,7 +150,7 @@ function (google_cloud_cpp_generator_define_tests)
+     endforeach ()
+ endfunction ()
+ 
+-add_subdirectory(integration_tests)
++# add_subdirectory(integration_tests)
+ 
+ # Only define the tests if testing is enabled. Package maintainers may not want
+ # to build all the tests everytime they create a new package or when the package
+diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt
+index 09a4b58..9c85374 100644
+--- a/google/cloud/CMakeLists.txt
++++ b/google/cloud/CMakeLists.txt
+@@ -548,5 +548,5 @@ if (GOOGLE_CLOUD_CPP_ENABLE_GRPC)
+         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_grpc_utils"
+         COMPONENT google_cloud_cpp_development)
+ 
+-    add_subdirectory(samples)
++    #add_subdirectory(samples)
+ endif ()
+diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt
+index 399c84f..d58c910 100644
+--- a/google/cloud/bigtable/CMakeLists.txt
++++ b/google/cloud/bigtable/CMakeLists.txt
+@@ -323,12 +323,12 @@ if (BUILD_TESTING)
+     add_subdirectory(tests)
+ endif ()
+ 
+-add_subdirectory(benchmarks)
++# add_subdirectory(benchmarks)
+ 
+ if (GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
+     # The examples are more readable if we use exceptions for error handling. We
+     # had to tradeoff readability vs. "making them compile everywhere".
+-    add_subdirectory(examples)
++    #add_subdirectory(examples)
+ endif (GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
+ 
+ # Export the CMake targets to make it easy to create configuration files.
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 0da849f0d..f597e30ae 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -8,8 +8,12 @@ vcpkg_from_github(
     REF v1.25.0
     SHA512 db1803b9de38028a171d3b295b85da5dd36f150c78f2ec523f24eb67998c27d06584aa26e572cab8508841cb469c980304501b87f4157a8020f85bc733f968b5
     HEAD_REF master
+    PATCHES
+        disable-benchmarks.patch
 )
 
+vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -17,10 +21,11 @@ vcpkg_configure_cmake(
     OPTIONS
         -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF
         -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF
+        -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF
         -DBUILD_TESTING=OFF
 )
 
-vcpkg_install_cmake(ADD_BIN_TO_PATH)
+vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json
index 4c9f4791c..07eb59b4f 100644
--- a/ports/google-cloud-cpp/vcpkg.json
+++ b/ports/google-cloud-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "google-cloud-cpp",
   "version": "1.25.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "C++ Client Libraries for Google Cloud Platform APIs.",
   "homepage": "https://github.com/googleapis/google-cloud-cpp",
   "license": "Apache-2.0",
@@ -15,6 +15,10 @@
         "ssl"
       ]
     },
+    {
+      "name": "grpc",
+      "host": true
+    },
     "grpc",
     "nlohmann-json"
   ]