From 0dbc334ef55db4348b870bd3db12a0b4b7d96df8 Mon Sep 17 00:00:00 2001
From: Carlos O'Ryan <coryan@users.noreply.github.com>
Date: Wed, 3 Jun 2020 01:46:06 -0400
Subject: [google-cloud-cpp] Consolidate all google-cloud* packages (#11698)

* [google-cloud-cpp] Consolidate all google-cloud* packages

Starting with the v1.14.0 release all google-cloud* packages and the
googleapis package are kept in a single repository and released
simultaneously.

* Update CI baseline.

google-cloud-cpp used to inherit failures from googleapis, which
indicates these are (probably) problems in the generated protobuf/grpc
code.
---
 ports/google-cloud-cpp-common/CONTROL        | 11 +++-------
 ports/google-cloud-cpp-common/portfile.cmake | 31 +---------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

(limited to 'ports/google-cloud-cpp-common')

diff --git a/ports/google-cloud-cpp-common/CONTROL b/ports/google-cloud-cpp-common/CONTROL
index 6408941b2..481343c97 100644
--- a/ports/google-cloud-cpp-common/CONTROL
+++ b/ports/google-cloud-cpp-common/CONTROL
@@ -1,9 +1,4 @@
 Source: google-cloud-cpp-common
-Version: 0.25.0
-Build-Depends: grpc, googleapis
-Description: Base C++ Libraries for Google Cloud Platform APIs
-Homepage: https://github.com/googleapis/google-cloud-cpp-common
-
-Feature: test
-Description: Build test
-Build-Depends: gtest
+Version: alias
+Build-Depends: google-cloud-cpp
+Description: Deprecated, use google-cloud-cpp instead
diff --git a/ports/google-cloud-cpp-common/portfile.cmake b/ports/google-cloud-cpp-common/portfile.cmake
index e4ba4fa72..065116c27 100644
--- a/ports/google-cloud-cpp-common/portfile.cmake
+++ b/ports/google-cloud-cpp-common/portfile.cmake
@@ -1,30 +1 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO googleapis/google-cloud-cpp-common
-    REF v0.25.0
-    SHA512 074294e8b824d7f2b9d6d4051f4fbb28ca83166aad98ff000348abb238488b1c957726d901dae041bf50aa23ab368da5cf1d23ad42454f9ad07153976c0a29fe
-    HEAD_REF master)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    test BUILD_TESTING
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    DISABLE_PARALLEL_CONFIGURE
-    OPTIONS
-    ${FEATURE_OPTIONS}
-    -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF)
-
-vcpkg_install_cmake(ADD_BIN_TO_PATH)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-vcpkg_copy_pdbs()
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-- 
cgit v1.2.3