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.

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

fix: remove duplicate protos #10486

Merged
merged 2 commits into from
Jan 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 12 additions & 13 deletions google/cloud/speech/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,18 @@ if (PROTO_INCLUDE_DIR)
list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
endif ()

include(CompileProtos)
google_cloud_cpp_load_protolist(
proto_list
"${PROJECT_SOURCE_DIR}/external/googleapis/protolists/speech.list")
google_cloud_cpp_load_protodeps(
proto_deps
"${PROJECT_SOURCE_DIR}/external/googleapis/protodeps/speech.deps")
google_cloud_cpp_grpcpp_library(
google_cloud_cpp_speech_protos # cmake-format: sort
${proto_list} PROTO_PATH_DIRECTORIES "${EXTERNAL_GOOGLEAPIS_SOURCE}"
"${PROTO_INCLUDE_DIR}")
external_googleapis_set_version_and_alias(speech_protos)
target_link_libraries(google_cloud_cpp_speech_protos PUBLIC ${proto_deps})
add_library(google_cloud_cpp_speech_protos INTERFACE)
target_link_libraries(google_cloud_cpp_speech_protos
INTERFACE google-cloud-cpp::cloud_speech_protos)
set_target_properties(
google_cloud_cpp_speech_protos
PROPERTIES EXPORT_NAME google-cloud-cpp::speech_protos
VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}")
target_compile_options(google_cloud_cpp_speech_protos
INTERFACE ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
add_library(google-cloud-cpp::speech_protos ALIAS
google_cloud_cpp_speech_protos)

file(
GLOB source_files
Expand Down
25 changes: 12 additions & 13 deletions google/cloud/texttospeech/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,18 @@ if (PROTO_INCLUDE_DIR)
list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
endif ()

include(CompileProtos)
google_cloud_cpp_load_protolist(
proto_list
"${PROJECT_SOURCE_DIR}/external/googleapis/protolists/texttospeech.list")
google_cloud_cpp_load_protodeps(
proto_deps
"${PROJECT_SOURCE_DIR}/external/googleapis/protodeps/texttospeech.deps")
google_cloud_cpp_grpcpp_library(
google_cloud_cpp_texttospeech_protos # cmake-format: sort
${proto_list} PROTO_PATH_DIRECTORIES "${EXTERNAL_GOOGLEAPIS_SOURCE}"
"${PROTO_INCLUDE_DIR}")
external_googleapis_set_version_and_alias(texttospeech_protos)
target_link_libraries(google_cloud_cpp_texttospeech_protos PUBLIC ${proto_deps})
add_library(google_cloud_cpp_texttospeech_protos INTERFACE)
target_link_libraries(google_cloud_cpp_texttospeech_protos
INTERFACE google-cloud-cpp::cloud_texttospeech_protos)
set_target_properties(
google_cloud_cpp_texttospeech_protos
PROPERTIES EXPORT_NAME google-cloud-cpp::texttospeech_protos
VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}")
target_compile_options(google_cloud_cpp_texttospeech_protos
INTERFACE ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
add_library(google-cloud-cpp::texttospeech_protos ALIAS
google_cloud_cpp_texttospeech_protos)

file(
GLOB source_files
Expand Down
25 changes: 13 additions & 12 deletions google/cloud/trace/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,19 @@ if (PROTO_INCLUDE_DIR)
list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
endif ()

include(CompileProtos)
google_cloud_cpp_load_protolist(
proto_list
"${PROJECT_SOURCE_DIR}/external/googleapis/protolists/trace.list")
google_cloud_cpp_load_protodeps(
proto_deps "${PROJECT_SOURCE_DIR}/external/googleapis/protodeps/trace.deps")
google_cloud_cpp_grpcpp_library(
google_cloud_cpp_trace_protos # cmake-format: sort
${proto_list} PROTO_PATH_DIRECTORIES "${EXTERNAL_GOOGLEAPIS_SOURCE}"
"${PROTO_INCLUDE_DIR}")
external_googleapis_set_version_and_alias(trace_protos)
target_link_libraries(google_cloud_cpp_trace_protos PUBLIC ${proto_deps})
add_library(google_cloud_cpp_trace_protos INTERFACE)
target_link_libraries(
google_cloud_cpp_trace_protos
INTERFACE google-cloud-cpp::devtools_cloudtrace_v2_trace_protos
google-cloud-cpp::devtools_cloudtrace_v2_tracing_protos)
set_target_properties(
google_cloud_cpp_trace_protos
PROPERTIES EXPORT_NAME google-cloud-cpp::trace_protos
VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}")
target_compile_options(google_cloud_cpp_trace_protos
INTERFACE ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
add_library(google-cloud-cpp::trace_protos ALIAS google_cloud_cpp_trace_protos)

file(
GLOB source_files
Expand Down