refactor(cmake): use template for config.cmake.in (#12487)

googleapis · Aug 29, 2023 · 6a0289c · 6a0289c
1 parent f4d0baf
commit 6a0289c
Show file tree

Hide file tree

Showing 115 changed files with 27 additions and 2,425 deletions.
diff --git a/cmake/GoogleCloudCppLibrary.cmake b/cmake/GoogleCloudCppLibrary.cmake
@@ -35,11 +35,13 @@
 #   `cloud_speech_protos`) that must continue to exist. We add interface
 #   libraries for these, which link to the desired proto library. See #8022 for
 #   more details.
+# * CROSS_LIB_DEPS: a list of client libraries which this library depends on.
 #
 function (google_cloud_cpp_add_ga_grpc_library library display_name)
     cmake_parse_arguments(
         _opt "EXPERIMENTAL" ""
-        "ADDITIONAL_PROTO_LISTS;BACKWARDS_COMPAT_PROTO_TARGETS" ${ARGN})
+        "ADDITIONAL_PROTO_LISTS;BACKWARDS_COMPAT_PROTO_TARGETS;CROSS_LIB_DEPS"
+        ${ARGN})
     set(library_target "google_cloud_cpp_${library}")
     set(mocks_target "google_cloud_cpp_${library}_mocks")
     set(protos_target "google_cloud_cpp_${library}_protos")
@@ -57,6 +59,9 @@ function (google_cloud_cpp_add_ga_grpc_library library display_name)
     endif ()
     set(DOXYGEN_EXCLUDE_SYMBOLS "internal")
     set(DOXYGEN_EXAMPLE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/quickstart")
+    set(GOOGLE_CLOUD_CPP_DOXYGEN_EXTRA_INCLUDES "${_opt_CROSS_LIB_DEPS}")
+    list(TRANSFORM GOOGLE_CLOUD_CPP_DOXYGEN_EXTRA_INCLUDES
+         PREPEND "${PROJECT_BINARY_DIR}/google/cloud/")
 
     unset(mocks_globs)
     unset(source_globs)
@@ -201,7 +206,15 @@ function (google_cloud_cpp_add_ga_grpc_library library display_name)
 
     # Create and install the CMake configuration files.
     include(CMakePackageConfigHelpers)
-    configure_file("config.cmake.in" "${library_target}-config.cmake" @ONLY)
+    set(GOOGLE_CLOUD_CPP_CONFIG_LIBRARY "${library_target}")
+    set(find_dependencies "${_opt_CROSS_LIB_DEPS}")
+    list(TRANSFORM find_dependencies
+         PREPEND "find_dependency(google_cloud_cpp_")
+    list(TRANSFORM find_dependencies APPEND ")")
+    string(JOIN "\n" GOOGLE_CLOUD_CPP_ADDITIONAL_FIND_DEPENDENCIES
+           ${find_dependencies})
+    configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/config.cmake.in"
+                   "${library_target}-config.cmake" @ONLY)
     write_basic_package_version_file(
         "${library_target}-config-version.cmake"
         VERSION ${PROJECT_VERSION}

diff --git a/google/cloud/alloydb/config.cmake.in → cmake/templates/config.cmake.in b/google/cloud/alloydb/config.cmake.in → cmake/templates/config.cmake.in
@@ -18,5 +18,6 @@ find_dependency(google_cloud_cpp_googleapis)
 find_dependency(google_cloud_cpp_common)
 find_dependency(google_cloud_cpp_grpc_utils)
 find_dependency(absl)
+@GOOGLE_CLOUD_CPP_ADDITIONAL_FIND_DEPENDENCIES@
 
-include("${CMAKE_CURRENT_LIST_DIR}/google_cloud_cpp_alloydb-targets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@GOOGLE_CLOUD_CPP_CONFIG_LIBRARY@-targets.cmake")
diff --git a/google/cloud/accessapproval/config.cmake.in b/google/cloud/accessapproval/config.cmake.in
diff --git a/google/cloud/accesscontextmanager/config.cmake.in b/google/cloud/accesscontextmanager/config.cmake.in
diff --git a/google/cloud/advisorynotifications/config.cmake.in b/google/cloud/advisorynotifications/config.cmake.in
diff --git a/google/cloud/aiplatform/config.cmake.in b/google/cloud/aiplatform/config.cmake.in
diff --git a/google/cloud/apigateway/config.cmake.in b/google/cloud/apigateway/config.cmake.in
diff --git a/google/cloud/apigeeconnect/config.cmake.in b/google/cloud/apigeeconnect/config.cmake.in
diff --git a/google/cloud/apikeys/config.cmake.in b/google/cloud/apikeys/config.cmake.in
diff --git a/google/cloud/appengine/config.cmake.in b/google/cloud/appengine/config.cmake.in
diff --git a/google/cloud/artifactregistry/config.cmake.in b/google/cloud/artifactregistry/config.cmake.in
diff --git a/google/cloud/asset/CMakeLists.txt b/google/cloud/asset/CMakeLists.txt
@@ -18,18 +18,17 @@ include(GoogleCloudCppLibrary)
 
 set(GOOGLE_CLOUD_CPP_SERVICE_DIRS "" "v1/")
 
-set(GOOGLE_CLOUD_CPP_DOXYGEN_EXTRA_INCLUDES
-    "${PROJECT_BINARY_DIR}/google/cloud/accesscontextmanager"
-    "${PROJECT_BINARY_DIR}/google/cloud/osconfig")
-
 google_cloud_cpp_add_ga_grpc_library(
     asset
     "Cloud Asset API"
     # orgpolicy/v**1** is used *indirectly* by google/cloud/asset, therefore it
     # does not appear in protolists/asset.list. In addition, it is not compiled
     # by any other library. So, added manually.
     ADDITIONAL_PROTO_LISTS
-    "${EXTERNAL_GOOGLEAPIS_SOURCE}/google/cloud/orgpolicy/v1/orgpolicy.proto")
+    "${EXTERNAL_GOOGLEAPIS_SOURCE}/google/cloud/orgpolicy/v1/orgpolicy.proto"
+    CROSS_LIB_DEPS
+    "accesscontextmanager"
+    "osconfig")
 
 if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
     add_executable(asset_quickstart "quickstart/quickstart.cc")

diff --git a/google/cloud/asset/config.cmake.in b/google/cloud/asset/config.cmake.in
diff --git a/google/cloud/assuredworkloads/config.cmake.in b/google/cloud/assuredworkloads/config.cmake.in
diff --git a/google/cloud/automl/config.cmake.in b/google/cloud/automl/config.cmake.in
diff --git a/google/cloud/baremetalsolution/config.cmake.in b/google/cloud/baremetalsolution/config.cmake.in
diff --git a/google/cloud/batch/config.cmake.in b/google/cloud/batch/config.cmake.in