@@ -24,27 +24,28 @@ set(EXTERNAL_GOOGLEAPIS_SOURCE
2424 "${PROJECT_BINARY_DIR} /external/googleapis/src/googleapis_download" )
2525
2626set (EXTERNAL_GOOGLEAPIS_PROTO_FILES
27- "google/api/http.proto"
28- "google/api/httpbody.proto"
27+ # cmake-format: sort
2928 "google/api/annotations.proto"
3029 "google/api/auth.proto"
3130 "google/api/client.proto"
3231 "google/api/distribution.proto"
3332 "google/api/field_behavior.proto"
33+ "google/api/http.proto"
34+ "google/api/httpbody.proto"
3435 "google/api/label.proto"
3536 "google/api/launch_stage.proto"
3637 "google/api/metric.proto"
3738 "google/api/monitored_resource.proto"
3839 "google/api/resource.proto"
3940 "google/devtools/cloudtrace/v2/trace.proto"
4041 "google/devtools/cloudtrace/v2/tracing.proto"
41- "google/rpc/code.proto"
42- "google/rpc/error_details.proto"
43- "google/rpc/status.proto"
42+ "google/iam/v1/iam_policy.proto"
4443 "google/iam/v1/options.proto"
4544 "google/iam/v1/policy.proto"
46- "google/iam/v1/iam_policy.proto"
4745 "google/longrunning/operations.proto"
46+ "google/rpc/code.proto"
47+ "google/rpc/error_details.proto"
48+ "google/rpc/status.proto"
4849 "google/type/calendar_period.proto"
4950 "google/type/color.proto"
5051 "google/type/date.proto"
@@ -208,37 +209,38 @@ function (external_googleapis_set_version_and_alias short_name)
208209endfunction ()
209210
210211set (external_googleapis_installed_libraries_list
211- google_cloud_cpp_bigtable_protos
212- google_cloud_cpp_cloud_bigquery_protos
213- google_cloud_cpp_cloud_speech_protos
214- google_cloud_cpp_cloud_texttospeech_protos
215- google_cloud_cpp_iam_protos
216- google_cloud_cpp_pubsub_protos
217- google_cloud_cpp_spanner_protos
218- google_cloud_cpp_storage_protos
219- google_cloud_cpp_longrunning_operations_protos
220- google_cloud_cpp_api_http_protos
221- google_cloud_cpp_api_httpbody_protos
212+ # cmake-format: sort
222213 google_cloud_cpp_api_annotations_protos
223214 google_cloud_cpp_api_auth_protos
224215 google_cloud_cpp_api_client_protos
225216 google_cloud_cpp_api_distribution_protos
226217 google_cloud_cpp_api_field_behavior_protos
218+ google_cloud_cpp_api_http_protos
219+ google_cloud_cpp_api_httpbody_protos
227220 google_cloud_cpp_api_label_protos
228221 google_cloud_cpp_api_launch_stage_protos
229222 google_cloud_cpp_api_metric_protos
230223 google_cloud_cpp_api_monitored_resource_protos
231224 google_cloud_cpp_api_resource_protos
225+ google_cloud_cpp_bigtable_protos
226+ google_cloud_cpp_cloud_bigquery_protos
227+ google_cloud_cpp_cloud_speech_protos
228+ google_cloud_cpp_cloud_texttospeech_protos
232229 google_cloud_cpp_devtools_cloudtrace_v2_trace_protos
233230 google_cloud_cpp_devtools_cloudtrace_v2_tracing_protos
234- google_cloud_cpp_logging_protos
235- google_cloud_cpp_monitoring_protos
231+ google_cloud_cpp_iam_protos
232+ google_cloud_cpp_iam_v1_iam_policy_protos
236233 google_cloud_cpp_iam_v1_options_protos
237234 google_cloud_cpp_iam_v1_policy_protos
238- google_cloud_cpp_iam_v1_iam_policy_protos
235+ google_cloud_cpp_logging_protos
236+ google_cloud_cpp_longrunning_operations_protos
237+ google_cloud_cpp_monitoring_protos
238+ google_cloud_cpp_pubsub_protos
239239 google_cloud_cpp_rpc_code_protos
240240 google_cloud_cpp_rpc_error_details_protos
241241 google_cloud_cpp_rpc_status_protos
242+ google_cloud_cpp_spanner_protos
243+ google_cloud_cpp_storage_protos
242244 google_cloud_cpp_type_calendar_period_protos
243245 google_cloud_cpp_type_color_protos
244246 google_cloud_cpp_type_date_protos
@@ -256,21 +258,15 @@ set(external_googleapis_installed_libraries_list
256258 google_cloud_cpp_type_quaternion_protos
257259 google_cloud_cpp_type_timeofday_protos)
258260
259- external_googleapis_add_library("google/api/http.proto" )
260- external_googleapis_add_library("google/api/httpbody.proto" )
261- external_googleapis_add_library("google/api/metric.proto"
262- api_launch_stage_protos api_label_protos)
263- external_googleapis_add_library("google/api/monitored_resource.proto"
264- api_launch_stage_protos api_label_protos)
265- external_googleapis_add_library("google/api/annotations.proto" api_http_protos)
266- external_googleapis_add_library("google/api/auth.proto" api_annotations_protos)
261+ # Keep these sorted to simplify maintenance
267262external_googleapis_add_library("google/api/client.proto" )
268263external_googleapis_add_library("google/api/distribution.proto" )
269264external_googleapis_add_library("google/api/field_behavior.proto" )
265+ external_googleapis_add_library("google/api/http.proto" )
266+ external_googleapis_add_library("google/api/httpbody.proto" )
270267external_googleapis_add_library("google/api/label.proto" )
271268external_googleapis_add_library("google/api/launch_stage.proto" )
272269external_googleapis_add_library("google/api/resource.proto" )
273-
274270external_googleapis_add_library("google/type/calendar_period.proto" )
275271external_googleapis_add_library("google/type/color.proto" )
276272external_googleapis_add_library("google/type/date.proto" )
@@ -287,16 +283,22 @@ external_googleapis_add_library("google/type/phone_number.proto")
287283external_googleapis_add_library("google/type/postal_address.proto" )
288284external_googleapis_add_library("google/type/quaternion.proto" )
289285external_googleapis_add_library("google/type/timeofday.proto" )
290-
291286external_googleapis_add_library("google/rpc/code.proto" )
292287external_googleapis_add_library("google/rpc/error_details.proto" )
293- external_googleapis_add_library("google/rpc/status.proto"
294- rpc_error_details_protos)
295288
289+ # Out of order because they have dependencies.
290+ external_googleapis_add_library("google/api/annotations.proto" api_http_protos)
291+ external_googleapis_add_library("google/api/auth.proto" api_annotations_protos)
292+ external_googleapis_add_library("google/api/metric.proto"
293+ api_launch_stage_protos api_label_protos)
294+ external_googleapis_add_library("google/api/monitored_resource.proto"
295+ api_launch_stage_protos api_label_protos)
296296external_googleapis_add_library("google/iam/v1/options.proto"
297297 api_annotations_protos)
298298external_googleapis_add_library("google/iam/v1/policy.proto"
299299 api_annotations_protos type_expr_protos)
300+ external_googleapis_add_library("google/rpc/status.proto"
301+ rpc_error_details_protos)
300302
301303external_googleapis_add_library(
302304 "google/iam/v1/iam_policy.proto"
0 commit comments