From 7e50ad50b84ed6098060531e8980a2925323bc9b Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 23 Aug 2019 10:17:09 -0400 Subject: [PATCH 1/4] chore: Irregularly scheduled update for the protos. Update to the version of googleapis/googleapis as-of 2019-08-23. --- CMakeLists.txt | 18 ++++++++++++++++-- cmake/config.cmake.in | 3 ++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea6e09867..78fbb7bf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,10 +39,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # downloaded from GitHub. set( GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL - "https://github.com/googleapis/googleapis/archive/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz" + "https://github.com/googleapis/googleapis/archive/9c9f778aedde02f9826d2ae5d0f9c96409ba0f25.tar.gz" ) set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256 - "6b8a9b2bcb4476e9a5a9872869996f0d639c8d5df76dd8a893e79201f211b1cf") + "13af135d8cc9b81b47d6fbfc258fe790a151956d06e01fd16671aa49fe536ab1") set(GOOGLEAPIS_CPP_SOURCE "${CMAKE_BINARY_DIR}/external/googleapis/src/googleapis_download") @@ -68,6 +68,7 @@ ExternalProject_Add( "${GOOGLEAPIS_CPP_SOURCE}/google/type/expr.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/rpc/error_details.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/rpc/status.proto" + "${GOOGLEAPIS_CPP_SOURCE}/google/iam/v1/options.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/iam/v1/policy.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/iam/v1/iam_policy.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/longrunning/operations.proto" @@ -202,6 +203,17 @@ target_link_libraries(googleapis_cpp_rpc_status_protos PUBLIC googleapis-c++::rpc_error_details_protos PRIVATE googleapis_cpp_common_flags) +google_cloud_cpp_grpcpp_library( + googleapis_cpp_iam_v1_options_protos + "${GOOGLEAPIS_CPP_SOURCE}/google/iam/v1/options.proto" + PROTO_PATH_DIRECTORIES + "${GOOGLEAPIS_CPP_SOURCE}" + "${PROTO_INCLUDE_DIR}") +googleapis_cpp_set_version_and_alias(iam_v1_options_protos) +target_link_libraries(googleapis_cpp_iam_v1_options_protos + PUBLIC googleapis-c++::api_annotations_protos + PRIVATE googleapis_cpp_common_flags) + google_cloud_cpp_grpcpp_library( googleapis_cpp_iam_v1_policy_protos "${GOOGLEAPIS_CPP_SOURCE}/google/iam/v1/policy.proto" @@ -321,6 +333,7 @@ set(googleapis_cpp_installed_libraries_list googleapis_cpp_api_resource_protos googleapis_cpp_devtools_cloudtrace_v2_trace_protos googleapis_cpp_devtools_cloudtrace_v2_tracing_protos + googleapis_cpp_iam_v1_options_protos googleapis_cpp_iam_v1_policy_protos googleapis_cpp_iam_v1_iam_policy_protos googleapis_cpp_rpc_error_details_protos @@ -407,6 +420,7 @@ set(GOOGLE_CLOUD_CPP_PC_DESCRIPTION string(CONCAT GOOGLE_CLOUD_CPP_PC_REQUIRES "googleapis_cpp_bigtable_protos" " googleapis_cpp_iam_v1_iam_policy_protos" + " googleapis_cpp_iam_v1_options_protos" " googleapis_cpp_iam_v1_policy_protos" " googleapis_cpp_longrunning_operations_protos" " googleapis_cpp_api_auth_protos" diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index a06216e72..88b6fff02 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -29,7 +29,8 @@ foreach (_target devtools_cloudtrace_v2_trace devtools_cloudtrace_v2_tracing iam_v1_iam_policy - iam_v1_policy + iam_v1_iam_policy + iam_v1_options longrunning_operations rpc_error_details rpc_status From 3c87089d12ae5b6099546a122b7230ec02dd1d17 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 23 Aug 2019 11:29:53 -0400 Subject: [PATCH 2/4] Argh, wrong target names. --- cmake/config.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index 88b6fff02..2dd920197 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -29,8 +29,8 @@ foreach (_target devtools_cloudtrace_v2_trace devtools_cloudtrace_v2_tracing iam_v1_iam_policy - iam_v1_iam_policy iam_v1_options + iam_v1_policy longrunning_operations rpc_error_details rpc_status From e9bbfa0288f19c7135b2a4a5236ce847a0cfc9b2 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 23 Aug 2019 11:43:02 -0400 Subject: [PATCH 3/4] Fix dependencies, yay for CI builds. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78fbb7bf3..c521608e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,6 +236,7 @@ google_cloud_cpp_grpcpp_library( googleapis_cpp_set_version_and_alias(iam_v1_iam_policy_protos) target_link_libraries(googleapis_cpp_iam_v1_iam_policy_protos PUBLIC googleapis-c++::api_annotations_protos + googleapis-c++::iam_v1_options_protos googleapis-c++::iam_v1_policy_protos PRIVATE googleapis_cpp_common_flags) From f19bdd987fff993d529195e78b7810f100c5a4a5 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 23 Aug 2019 12:27:08 -0400 Subject: [PATCH 4/4] Add yet another new dependency. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c521608e6..57384b87a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,6 +236,7 @@ google_cloud_cpp_grpcpp_library( googleapis_cpp_set_version_and_alias(iam_v1_iam_policy_protos) target_link_libraries(googleapis_cpp_iam_v1_iam_policy_protos PUBLIC googleapis-c++::api_annotations_protos + googleapis-c++::api_client_protos googleapis-c++::iam_v1_options_protos googleapis-c++::iam_v1_policy_protos PRIVATE googleapis_cpp_common_flags) @@ -331,6 +332,7 @@ set(googleapis_cpp_installed_libraries_list googleapis_cpp_api_http_protos googleapis_cpp_api_annotations_protos googleapis_cpp_api_auth_protos + googleapis_cpp_api_client_protos googleapis_cpp_api_resource_protos googleapis_cpp_devtools_cloudtrace_v2_trace_protos googleapis_cpp_devtools_cloudtrace_v2_tracing_protos