From 62991403ddd4c064c2f5cac99bb9d75d8ca94b99 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 16 Aug 2019 09:00:17 -0400 Subject: [PATCH 1/2] feat: Add library for cloudtrace/v2/trace.proto. --- CMakeLists.txt | 14 ++++++++++++++ cmake/config.cmake.in | 1 + 2 files changed, 15 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37c38002e..d4e51b2ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ ExternalProject_Add( "${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/devtools/cloudtrace/v2/trace.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/type/expr.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/rpc/error_details.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/rpc/status.proto" @@ -280,6 +281,18 @@ target_link_libraries(googleapis_cpp_spanner_protos googleapis-c++::iam_v1_iam_policy_protos PRIVATE googleapis_cpp_common_flags) +google_cloud_cpp_grpcpp_library( + googleapis_cpp_devtools_cloudtrace_v2_trace_protos + "${GOOGLEAPIS_CPP_SOURCE}/google/devtools/cloudtrace/v2/trace.proto" + PROTO_PATH_DIRECTORIES + "${GOOGLEAPIS_CPP_SOURCE}" + "${PROTO_INCLUDE_DIR}") +googleapis_cpp_set_version_and_alias(devtools_cloudtrace_v2_trace_protos) +target_link_libraries(googleapis_cpp_devtools_cloudtrace_v2_trace_protos + PUBLIC googleapis-c++::api_annotations_protos + googleapis-c++::rpc_status_protos + PRIVATE googleapis_cpp_common_flags) + # Install the libraries and headers in the locations determined by # GNUInstallDirs include(GNUInstallDirs) @@ -292,6 +305,7 @@ set(googleapis_cpp_installed_libraries_list googleapis_cpp_api_annotations_protos googleapis_cpp_api_auth_protos googleapis_cpp_api_resource_protos + googleapis_cpp_devtools_cloudtrace_v2_trace_protos googleapis_cpp_iam_v1_policy_protos googleapis_cpp_iam_v1_iam_policy_protos googleapis_cpp_rpc_error_details_protos diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index 422540496..c733cb237 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -26,6 +26,7 @@ foreach (_target api_http api_resource bigtable + devtools_cloudtrace_v2_trace iam_v1_iam_policy iam_v1_policy longrunning_operations From 1e638c6002209a08be784f1ee044a034cbf0f2ab Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 16 Aug 2019 10:10:41 -0400 Subject: [PATCH 2/2] Addressed review comments. --- CMakeLists.txt | 15 +++++++++++++++ cmake/config.cmake.in | 1 + 2 files changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4e51b2ea..ea6e09867 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,7 @@ ExternalProject_Add( "${GOOGLEAPIS_CPP_SOURCE}/google/api/client.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/api/resource.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/devtools/cloudtrace/v2/trace.proto" + "${GOOGLEAPIS_CPP_SOURCE}/google/devtools/cloudtrace/v2/tracing.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/type/expr.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/rpc/error_details.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/rpc/status.proto" @@ -293,6 +294,19 @@ target_link_libraries(googleapis_cpp_devtools_cloudtrace_v2_trace_protos googleapis-c++::rpc_status_protos PRIVATE googleapis_cpp_common_flags) +google_cloud_cpp_grpcpp_library( + googleapis_cpp_devtools_cloudtrace_v2_tracing_protos + "${GOOGLEAPIS_CPP_SOURCE}/google/devtools/cloudtrace/v2/tracing.proto" + PROTO_PATH_DIRECTORIES + "${GOOGLEAPIS_CPP_SOURCE}" + "${PROTO_INCLUDE_DIR}") +googleapis_cpp_set_version_and_alias(devtools_cloudtrace_v2_tracing_protos) +target_link_libraries(googleapis_cpp_devtools_cloudtrace_v2_tracing_protos + PUBLIC googleapis-c++::devtools_cloudtrace_v2_trace_protos + googleapis-c++::api_annotations_protos + googleapis-c++::rpc_status_protos + PRIVATE googleapis_cpp_common_flags) + # Install the libraries and headers in the locations determined by # GNUInstallDirs include(GNUInstallDirs) @@ -306,6 +320,7 @@ set(googleapis_cpp_installed_libraries_list googleapis_cpp_api_auth_protos googleapis_cpp_api_resource_protos googleapis_cpp_devtools_cloudtrace_v2_trace_protos + googleapis_cpp_devtools_cloudtrace_v2_tracing_protos googleapis_cpp_iam_v1_policy_protos googleapis_cpp_iam_v1_iam_policy_protos googleapis_cpp_rpc_error_details_protos diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index c733cb237..a06216e72 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -27,6 +27,7 @@ foreach (_target api_resource bigtable devtools_cloudtrace_v2_trace + devtools_cloudtrace_v2_tracing iam_v1_iam_policy iam_v1_policy longrunning_operations