Fix proto namespace support for plugins

ref:64f38ab703c48a08c49a2ede68481651c4d51f13

2 files changed, 3 insertions, 55 deletions

diff --git a/contrib/libs/apache/orc/CMakeLists.txt b/contrib/libs/apache/orc/CMakeLists.txt
index 6705cbfe09..463c2b420e 100644
--- a/contrib/libs/apache/orc/CMakeLists.txt
+++ b/contrib/libs/apache/orc/CMakeLists.txt
@@ -59,7 +59,6 @@ target_sources(libs-apache-orc PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/orc/c++/src/Writer.cc
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/orc/c++/src/io/InputStream.cc
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/orc/c++/src/io/OutputStream.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/apache/orc/proto/orc_proto.pb.cc
 )
 target_proto_addincls(libs-apache-orc
   ./
diff --git a/contrib/libs/googleapis-common-protos/CMakeLists.txt b/contrib/libs/googleapis-common-protos/CMakeLists.txt
index 1da5c7b8f4..5ceb3387d9 100644
--- a/contrib/libs/googleapis-common-protos/CMakeLists.txt
+++ b/contrib/libs/googleapis-common-protos/CMakeLists.txt
@@ -11,6 +11,9 @@ add_library(contrib-libs-googleapis-common-protos)
 set_property(TARGET contrib-libs-googleapis-common-protos PROPERTY
   PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
 )
+set_property(TARGET contrib-libs-googleapis-common-protos PROPERTY
+  PROTO_NAMESPACE contrib/libs/googleapis-common-protos
+)
 target_include_directories(contrib-libs-googleapis-common-protos PUBLIC
   ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos
 )
@@ -77,60 +80,6 @@ target_proto_messages(contrib-libs-googleapis-common-protos PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/googleapis-common-protos/google/type/quaternion.proto
   ${CMAKE_SOURCE_DIR}/contrib/libs/googleapis-common-protos/google/type/timeofday.proto
 )
-target_sources(contrib-libs-googleapis-common-protos PRIVATE
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/annotations.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/auth.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/backend.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/billing.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/client.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/config_change.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/consumer.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/context.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/control.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/distribution.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/documentation.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/endpoint.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/field_behavior.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/http.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/httpbody.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/label.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/launch_stage.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/log.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/logging.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/metric.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/monitored_resource.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/monitoring.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/quota.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/resource.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/routing.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/service.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/source_info.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/system_parameter.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/api/usage.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/cloud/extended_operations.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/cloud/location/locations.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/gapic/metadata/gapic_metadata.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/logging/type/http_request.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/logging/type/log_severity.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/longrunning/operations.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/rpc/code.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/rpc/context/attribute_context.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/rpc/error_details.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/rpc/status.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/calendar_period.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/color.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/date.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/datetime.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/dayofweek.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/expr.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/fraction.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/latlng.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/money.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/month.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/postal_address.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/quaternion.pb.cc
-  ${CMAKE_BINARY_DIR}/contrib/libs/googleapis-common-protos/google/type/timeofday.pb.cc
-)
 target_proto_addincls(contrib-libs-googleapis-common-protos
   ./contrib/libs/googleapis-common-protos
   ${CMAKE_SOURCE_DIR}/contrib/libs/googleapis-common-protos