feat: Add library for api/client.proto.

Also fixed the list of libraries in googleapis-config.cmake.

2 files changed, 23 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0914a89bb8d7..37c38002e227 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,7 @@ ExternalProject_Add(
         "${GOOGLEAPIS_CPP_SOURCE}/google/api/http.proto"
         "${GOOGLEAPIS_CPP_SOURCE}/google/api/annotations.proto"
         "${GOOGLEAPIS_CPP_SOURCE}/google/api/auth.proto"
+        "${GOOGLEAPIS_CPP_SOURCE}/google/api/client.proto"
         "${GOOGLEAPIS_CPP_SOURCE}/google/api/resource.proto"
         "${GOOGLEAPIS_CPP_SOURCE}/google/type/expr.proto"
         "${GOOGLEAPIS_CPP_SOURCE}/google/rpc/error_details.proto"
@@ -149,6 +150,16 @@ target_link_libraries(googleapis_cpp_api_auth_protos
                       PRIVATE googleapis_cpp_common_flags)
 
 google_cloud_cpp_grpcpp_library(
+    googleapis_cpp_api_client_protos
+    "${GOOGLEAPIS_CPP_SOURCE}/google/api/client.proto"
+    PROTO_PATH_DIRECTORIES
+    "${GOOGLEAPIS_CPP_SOURCE}"
+    "${PROTO_INCLUDE_DIR}")
+googleapis_cpp_set_version_and_alias(api_client_protos)
+target_link_libraries(googleapis_cpp_api_client_protos
+                      PRIVATE googleapis_cpp_common_flags)
+
+google_cloud_cpp_grpcpp_library(
     googleapis_cpp_api_resource_protos
     "${GOOGLEAPIS_CPP_SOURCE}/google/api/resource.proto"
     PROTO_PATH_DIRECTORIES
diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
index 50ddd6bbd156..266756cc2400 100644
--- a/cmake/config.cmake.in
+++ b/cmake/config.cmake.in
@@ -1,3 +1,4 @@
+# ~~~
 # Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# ~~~
 
 include("${CMAKE_CURRENT_LIST_DIR}/FindProtobufTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/FindgRPC.cmake")
@@ -18,19 +20,20 @@ include("${CMAKE_CURRENT_LIST_DIR}/FindgRPC.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/googleapis-targets.cmake")
 
 foreach (_target
-         api_http
          api_annotations
          api_auth
-         rpc_status
-         rpc_error_details
-         longrunning_operations
-         iam_v1_policy
-         iam_v1_iam_policy
+         api_client
+         api_http
+         api_resource
          bigtable
-         spanner)
+         longrunning_operations
+         rpc_error_details
+         rpc_status
+         spanner
+         type_expr)
     set(scoped_name "googleapis-c++::${_target}_protos")
     set(imported_name "googleapis_cpp_${_target}_protos")
     add_library(${scoped_name} IMPORTED INTERFACE)
-    set_target_properties(${scoped_name} PROPERTIES
-            INTERFACE_LINK_LIBRARIES ${imported_name})
+    set_target_properties(${scoped_name}
+                          PROPERTIES INTERFACE_LINK_LIBRARIES ${imported_name})
 endforeach ()