mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13 from coryan/fix-missing-exports

Browse source 
feat: Add library for api/client.proto.
This commit is contained in:
Carlos O'Ryan 2019-08-15 09:48:04 -04:00 committed by GitHub
commit 36a7ebbe18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -61,6 +61,7 @@ ExternalProject_Add(
"${GOOGLEAPIS_CPP_SOURCE}/google/api/http.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/api/http.proto"
"${GOOGLEAPIS_CPP_SOURCE}/google/api/annotations.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/api/annotations.proto"
"${GOOGLEAPIS_CPP_SOURCE}/google/api/auth.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/api/resource.proto"
"${GOOGLEAPIS_CPP_SOURCE}/google/type/expr.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/type/expr.proto"
"${GOOGLEAPIS_CPP_SOURCE}/google/rpc/error_details.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/rpc/error_details.proto"
@ -148,6 +149,16 @@ target_link_libraries(googleapis_cpp_api_auth_protos
PUBLIC googleapis-c++::api_annotations_protos PUBLIC googleapis-c++::api_annotations_protos
PRIVATE googleapis_cpp_common_flags) 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( google_cloud_cpp_grpcpp_library(
googleapis_cpp_api_resource_protos googleapis_cpp_api_resource_protos
"${GOOGLEAPIS_CPP_SOURCE}/google/api/resource.proto" "${GOOGLEAPIS_CPP_SOURCE}/google/api/resource.proto"

21
cmake/config.cmake.in
View file

@ -1,3 +1,4 @@
# ~~~
# Copyright 2019 Google LLC # Copyright 2019 Google LLC
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # 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. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# ~~~
include("${CMAKE_CURRENT_LIST_DIR}/FindProtobufTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/FindProtobufTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/FindgRPC.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") include("${CMAKE_CURRENT_LIST_DIR}/googleapis-targets.cmake")
foreach (_target foreach (_target
api_http
api_annotations api_annotations
api_auth api_auth
rpc_status api_client
rpc_error_details api_http
longrunning_operations api_resource
iam_v1_policy
iam_v1_iam_policy
bigtable bigtable
spanner) longrunning_operations
rpc_error_details
rpc_status
spanner
type_expr)
set(scoped_name "googleapis-c++::${_target}_protos") set(scoped_name "googleapis-c++::${_target}_protos")
set(imported_name "googleapis_cpp_${_target}_protos") set(imported_name "googleapis_cpp_${_target}_protos")
add_library(${scoped_name} IMPORTED INTERFACE) add_library(${scoped_name} IMPORTED INTERFACE)
set_target_properties(${scoped_name} PROPERTIES set_target_properties(${scoped_name}
INTERFACE_LINK_LIBRARIES ${imported_name}) PROPERTIES INTERFACE_LINK_LIBRARIES ${imported_name})
endforeach () endforeach ()