From 0dbc334ef55db4348b870bd3db12a0b4b7d96df8 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan 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-spanner/CONTROL | 7 +++---- ports/google-cloud-cpp-spanner/portfile.cmake | 30 +-------------------------- 2 files changed, 4 insertions(+), 33 deletions(-) (limited to 'ports/google-cloud-cpp-spanner') diff --git a/ports/google-cloud-cpp-spanner/CONTROL b/ports/google-cloud-cpp-spanner/CONTROL index 82d7ea0a6..69cc73635 100644 --- a/ports/google-cloud-cpp-spanner/CONTROL +++ b/ports/google-cloud-cpp-spanner/CONTROL @@ -1,5 +1,4 @@ Source: google-cloud-cpp-spanner -Version: 1.1.0 -Build-Depends: grpc, googleapis, google-cloud-cpp-common -Description: C++ Client Library for Google Cloud Spanner. -Homepage: https://github.com/googleapis/google-cloud-cpp-spanner +Version: alias +Build-Depends: google-cloud-cpp +Description: Deprecated, use google-cloud-cpp instead diff --git a/ports/google-cloud-cpp-spanner/portfile.cmake b/ports/google-cloud-cpp-spanner/portfile.cmake index ffbae18df..065116c27 100644 --- a/ports/google-cloud-cpp-spanner/portfile.cmake +++ b/ports/google-cloud-cpp-spanner/portfile.cmake @@ -1,29 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO googleapis/google-cloud-cpp-spanner - REF v1.1.0 - SHA512 00141418a01ff55cf2228e3f59a49e49bc35e28da958a7817964976196bb6019e5f04e2d9ceacc758d649c8cc91d35df14aec23f9e8fa4044cfaa67115dc6e69 - HEAD_REF master -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF - -DBUILD_TESTING=OFF -) - -vcpkg_install_cmake(ADD_BIN_TO_PATH) - -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH 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