Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cmake): client libraries link to shared proto deps #12514

Merged
merged 1 commit into from
Aug 31, 2023
Merged

fix(cmake): client libraries link to shared proto deps #12514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmake/GoogleCloudCppLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ function (google_cloud_cpp_add_ga_grpc_library library display_name)
google_cloud_cpp_add_library_protos(${library} ADDITIONAL_PROTO_LISTS
${_opt_ADDITIONAL_PROTO_LISTS})

set(shared_proto_dep_targets "${_opt_SHARED_PROTO_DEPS}")
list(TRANSFORM shared_proto_dep_targets PREPEND "google-cloud-cpp::")
list(TRANSFORM shared_proto_dep_targets APPEND "_protos")

# We used to offer the proto library by another name. Maintain backwards
# compatibility by providing an interface library with that name. Also make
# sure we install it as part of google_cloud_cpp_${library}-targets.
Expand All @@ -234,7 +238,7 @@ function (google_cloud_cpp_add_ga_grpc_library library display_name)
target_link_libraries(
${library_target}
PUBLIC google-cloud-cpp::grpc_utils google-cloud-cpp::common
google-cloud-cpp::${library}_protos)
google-cloud-cpp::${library}_protos ${shared_proto_dep_targets})
google_cloud_cpp_add_common_options(${library_target})
set_target_properties(
${library_target}
Expand Down