[google-cloud-cpp] migrate to vcpkg_cmake_config_fixup() (#20521)

* [google-cloud-cpp] migrate to vcpkg_cmake_config_fixup()

* Address review comments
This commit is contained in:
Carlos O'Ryan 2021-10-05 19:03:03 -04:00 committed by GitHub
parent 8960971a0a
commit 1b8c00cf98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 3 deletions

View File

@ -31,9 +31,50 @@ vcpkg_cmake_configure(
vcpkg_cmake_install() vcpkg_cmake_install()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) foreach(feature IN LISTS FEATURES)
set(config_path "lib/cmake/google_cloud_cpp_${feature}")
# Most features get their own package in `google-cloud-cpp`.
# The exceptions are captured by this `if()` command, basically
# things like `core` and `experimental-storage-grpc` are skipped.
if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
continue()
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${feature}"
CONFIG_PATH "${config_path}"
DO_NOT_DELETE_PARENT_CONFIG_PATH)
endforeach()
# These packages are automatically installed depending on what features are
# enabled.
foreach(suffix common googleapis grpc_utils)
set(config_path "lib/cmake/google_cloud_cpp_${suffix}")
if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}")
continue()
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${suffix}"
CONFIG_PATH "${config_path}"
DO_NOT_DELETE_PARENT_CONFIG_PATH)
endforeach()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # These packages are only for backwards compability. The google-cloud-cpp team
# is planning to remove them around 2022-02-15.
foreach(package
googleapis
bigtable_client
pubsub_client
spanner_client
storage_client)
set(config_path "lib/cmake/google_cloud_cpp_${suffix}")
if(NOT IS_DIRECTORY "${config_path}")
continue()
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}"
CONFIG_PATH "${config_path}"
DO_NOT_DELETE_PARENT_CONFIG_PATH)
endforeach()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake"
"${CURRENT_PACKAGES_DIR}/debug/lib/cmake"
"${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

View File

@ -1,6 +1,7 @@
{ {
"name": "google-cloud-cpp", "name": "google-cloud-cpp",
"version": "1.32.0", "version": "1.32.0",
"port-version": 1,
"description": "C++ Client Libraries for Google Cloud Platform APIs.", "description": "C++ Client Libraries for Google Cloud Platform APIs.",
"homepage": "https://github.com/googleapis/google-cloud-cpp", "homepage": "https://github.com/googleapis/google-cloud-cpp",
"license": "Apache-2.0", "license": "Apache-2.0",
@ -10,6 +11,10 @@
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",
"host": true "host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
} }
], ],
"default-features": [ "default-features": [

View File

@ -2474,7 +2474,7 @@
}, },
"google-cloud-cpp": { "google-cloud-cpp": {
"baseline": "1.32.0", "baseline": "1.32.0",
"port-version": 0 "port-version": 1
}, },
"google-cloud-cpp-common": { "google-cloud-cpp-common": {
"baseline": "alias", "baseline": "alias",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2b53c52b812f1d7fe8ada0a6d938b047b5a3dbd2",
"version": "1.32.0",
"port-version": 1
},
{ {
"git-tree": "d138daefe227de160954ecdce23178fa659edb36", "git-tree": "d138daefe227de160954ecdce23178fa659edb36",
"version": "1.32.0", "version": "1.32.0",