Skip to content

Commit 77fa64e

Browse files
authored
fix: remove duplicate protos (#10486)
1 parent 07d51b6 commit 77fa64e

File tree

3 files changed

+37
-38
lines changed

3 files changed

+37
-38
lines changed

google/cloud/speech/CMakeLists.txt

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,18 @@ if (PROTO_INCLUDE_DIR)
4444
list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
4545
endif ()
4646

47-
include(CompileProtos)
48-
google_cloud_cpp_load_protolist(
49-
proto_list
50-
"${PROJECT_SOURCE_DIR}/external/googleapis/protolists/speech.list")
51-
google_cloud_cpp_load_protodeps(
52-
proto_deps
53-
"${PROJECT_SOURCE_DIR}/external/googleapis/protodeps/speech.deps")
54-
google_cloud_cpp_grpcpp_library(
55-
google_cloud_cpp_speech_protos # cmake-format: sort
56-
${proto_list} PROTO_PATH_DIRECTORIES "${EXTERNAL_GOOGLEAPIS_SOURCE}"
57-
"${PROTO_INCLUDE_DIR}")
58-
external_googleapis_set_version_and_alias(speech_protos)
59-
target_link_libraries(google_cloud_cpp_speech_protos PUBLIC ${proto_deps})
47+
add_library(google_cloud_cpp_speech_protos INTERFACE)
48+
target_link_libraries(google_cloud_cpp_speech_protos
49+
INTERFACE google-cloud-cpp::cloud_speech_protos)
50+
set_target_properties(
51+
google_cloud_cpp_speech_protos
52+
PROPERTIES EXPORT_NAME google-cloud-cpp::speech_protos
53+
VERSION "${PROJECT_VERSION}"
54+
SOVERSION "${PROJECT_VERSION_MAJOR}")
55+
target_compile_options(google_cloud_cpp_speech_protos
56+
INTERFACE ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
57+
add_library(google-cloud-cpp::speech_protos ALIAS
58+
google_cloud_cpp_speech_protos)
6059

6160
file(
6261
GLOB source_files

google/cloud/texttospeech/CMakeLists.txt

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,18 @@ if (PROTO_INCLUDE_DIR)
3434
list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
3535
endif ()
3636

37-
include(CompileProtos)
38-
google_cloud_cpp_load_protolist(
39-
proto_list
40-
"${PROJECT_SOURCE_DIR}/external/googleapis/protolists/texttospeech.list")
41-
google_cloud_cpp_load_protodeps(
42-
proto_deps
43-
"${PROJECT_SOURCE_DIR}/external/googleapis/protodeps/texttospeech.deps")
44-
google_cloud_cpp_grpcpp_library(
45-
google_cloud_cpp_texttospeech_protos # cmake-format: sort
46-
${proto_list} PROTO_PATH_DIRECTORIES "${EXTERNAL_GOOGLEAPIS_SOURCE}"
47-
"${PROTO_INCLUDE_DIR}")
48-
external_googleapis_set_version_and_alias(texttospeech_protos)
49-
target_link_libraries(google_cloud_cpp_texttospeech_protos PUBLIC ${proto_deps})
37+
add_library(google_cloud_cpp_texttospeech_protos INTERFACE)
38+
target_link_libraries(google_cloud_cpp_texttospeech_protos
39+
INTERFACE google-cloud-cpp::cloud_texttospeech_protos)
40+
set_target_properties(
41+
google_cloud_cpp_texttospeech_protos
42+
PROPERTIES EXPORT_NAME google-cloud-cpp::texttospeech_protos
43+
VERSION "${PROJECT_VERSION}"
44+
SOVERSION "${PROJECT_VERSION_MAJOR}")
45+
target_compile_options(google_cloud_cpp_texttospeech_protos
46+
INTERFACE ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
47+
add_library(google-cloud-cpp::texttospeech_protos ALIAS
48+
google_cloud_cpp_texttospeech_protos)
5049

5150
file(
5251
GLOB source_files

google/cloud/trace/CMakeLists.txt

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,19 @@ if (PROTO_INCLUDE_DIR)
3333
list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
3434
endif ()
3535

36-
include(CompileProtos)
37-
google_cloud_cpp_load_protolist(
38-
proto_list
39-
"${PROJECT_SOURCE_DIR}/external/googleapis/protolists/trace.list")
40-
google_cloud_cpp_load_protodeps(
41-
proto_deps "${PROJECT_SOURCE_DIR}/external/googleapis/protodeps/trace.deps")
42-
google_cloud_cpp_grpcpp_library(
43-
google_cloud_cpp_trace_protos # cmake-format: sort
44-
${proto_list} PROTO_PATH_DIRECTORIES "${EXTERNAL_GOOGLEAPIS_SOURCE}"
45-
"${PROTO_INCLUDE_DIR}")
46-
external_googleapis_set_version_and_alias(trace_protos)
47-
target_link_libraries(google_cloud_cpp_trace_protos PUBLIC ${proto_deps})
36+
add_library(google_cloud_cpp_trace_protos INTERFACE)
37+
target_link_libraries(
38+
google_cloud_cpp_trace_protos
39+
INTERFACE google-cloud-cpp::devtools_cloudtrace_v2_trace_protos
40+
google-cloud-cpp::devtools_cloudtrace_v2_tracing_protos)
41+
set_target_properties(
42+
google_cloud_cpp_trace_protos
43+
PROPERTIES EXPORT_NAME google-cloud-cpp::trace_protos
44+
VERSION "${PROJECT_VERSION}"
45+
SOVERSION "${PROJECT_VERSION_MAJOR}")
46+
target_compile_options(google_cloud_cpp_trace_protos
47+
INTERFACE ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
48+
add_library(google-cloud-cpp::trace_protos ALIAS google_cloud_cpp_trace_protos)
4849

4950
file(
5051
GLOB source_files

0 commit comments

Comments
 (0)