3 files changed, 13 insertions, 43 deletions
diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index 663e2de3a..195d3d6f5 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: google-cloud-cpp
-Version: 0.1.0-1
-Build-Depends: grpc, gtest
+Version: 0.6.0
+Build-Depends: grpc, gtest, curl, crc32c
 Description: C++ Client Libraries for Google Cloud Platform APIs.
diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch
deleted file mode 100644
index 63602ad72..000000000
--- a/ports/google-cloud-cpp/include-protobuf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/bigtable/CMakeLists.txt b/bigtable/CMakeLists.txt
-index 1b8089f..771e1ec 100644
---- a/bigtable/CMakeLists.txt
-+++ b/bigtable/CMakeLists.txt
-@@ -69,6 +69,10 @@ set(PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" "${PROJECT_SOUR
- if(GRPC_ROOT_DIR)
-     list(INSERT PROTOBUF_IMPORT_DIRS 0 "${GRPC_ROOT_DIR}/third_party/protobuf/src")
- endif(GRPC_ROOT_DIR)
-+find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto)
-+if(PROTO_INCLUDE_DIR)
-+    list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
-+endif()
- 
- # Get the destination directories based on the GNU recommendations.
- include(GNUInstallDirs)
-@@ -110,7 +114,7 @@ enable_testing()
- 
- # Capture the compiler version and the git revision into variables, then
- # generate a config file with the values.
--if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git)
-+if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git AND 0)
-     execute_process(COMMAND git rev-parse --short HEAD
-             OUTPUT_VARIABLE GIT_HEAD_LOG ERROR_VARIABLE GIT_HEAD_LOG)
- else ()
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 8ba1fffe5..0f8b14d84 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -1,25 +1,20 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GoogleCloudPlatform/google-cloud-cpp
-    REF v0.1.0
-    SHA512 3947cc24ca1ed97309f055f17945afe2d6b22ae8f54f86d3395f8c491b7409d4b7bb12206889d04d07f51236e9fd5afd65b904c8c80521a3313588d8069545c2
+    REF v0.5.0
+    SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5
     HEAD_REF master
-    PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/include-protobuf.patch"
 )
 
-set(GOOGLEAPIS_VERSION 92f10d7033c6fa36e1a5a369ab5aa8bafd564009)
+set(GOOGLEAPIS_VERSION 6a3277c0656219174ff7c345f31fb20a90b30b97)
 vcpkg_download_distfile(GOOGLEAPIS
-    URLS "https://github.com/google/googleapis/archive/92f10d7033c6fa36e1a5a369ab5aa8bafd564009.zip"
+    URLS "https://github.com/google/googleapis/archive/${GOOGLEAPIS_VERSION}.zip"
     FILENAME "googleapis-${GOOGLEAPIS_VERSION}.zip"
-    SHA512 4280ece965a231f6a0bb3ea38a961d15babd9eac517f9b0d57e12f186481bbab6a27e4f0ee03ba3c587c9aa93d3c2e6c95f67f50365c65bb10594f0229279287
+    SHA512 809b7cf0429df9867c8ab558857785e9d7d70aea033c6d588b60d29d2754001e9aea5fcdd8cae22fad8145226375bedbd1516d86af7d1e9731fffea331995ad9
 )
 
 file(REMOVE_RECURSE ${SOURCE_PATH}/third_party)
@@ -30,16 +25,15 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DGOOGLE_CLOUD_CPP_GRPC_PROVIDER=vcpkg
-        -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=vcpkg
+        -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
+        -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF
+	-DBUILD_TESTING=OFF
 )
 
 vcpkg_install_cmake(ADD_BIN_TO_PATH)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bigtable/client/testing)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake TARGET_PATH share/bigtable_client)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/google-cloud-cpp RENAME copyright)