aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvitalyisaev <vitalyisaev@yandex-team.com>2023-06-01 13:17:14 +0300
committervitalyisaev <vitalyisaev@yandex-team.com>2023-06-01 13:17:14 +0300
commit0a4ac4987ce610b0ba68042fa0db4b4aebe0af59 (patch)
treeb3aa2ece636e26dd7abf3e8dc7e41d3fe0a813ee
parenta3032a835ebe50ddfcc04988a0a204cab4c38df3 (diff)
downloadydb-0a4ac4987ce610b0ba68042fa0db4b4aebe0af59.tar.gz
Connector: avoid explicit naming for proto libraries
-rw-r--r--ydb/library/yql/providers/generic/connector/api/CMakeLists.darwin-x86_64.txt16
-rw-r--r--ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-aarch64.txt16
-rw-r--r--ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-x86_64.txt16
-rw-r--r--ydb/library/yql/providers/generic/connector/api/CMakeLists.windows-x86_64.txt16
-rw-r--r--ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.darwin-x86_64.txt10
-rw-r--r--ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-aarch64.txt10
-rw-r--r--ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-x86_64.txt10
-rw-r--r--ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.windows-x86_64.txt10
-rw-r--r--ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.darwin-x86_64.txt2
-rw-r--r--ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-aarch64.txt2
-rw-r--r--ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-x86_64.txt2
-rw-r--r--ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.windows-x86_64.txt2
-rw-r--r--ydb/library/yql/providers/generic/proto/CMakeLists.darwin-x86_64.txt2
-rw-r--r--ydb/library/yql/providers/generic/proto/CMakeLists.linux-aarch64.txt2
-rw-r--r--ydb/library/yql/providers/generic/proto/CMakeLists.linux-x86_64.txt2
-rw-r--r--ydb/library/yql/providers/generic/proto/CMakeLists.windows-x86_64.txt2
16 files changed, 60 insertions, 60 deletions
diff --git a/ydb/library/yql/providers/generic/connector/api/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/providers/generic/connector/api/CMakeLists.darwin-x86_64.txt
index 3fc29347835..fc57461fefa 100644
--- a/ydb/library/yql/providers/generic/connector/api/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/api/CMakeLists.darwin-x86_64.txt
@@ -26,21 +26,21 @@ get_built_tool_path(
cpp_styleguide
)
-add_library(api)
-set_property(TARGET api PROPERTY
+add_library(generic-connector-api)
+set_property(TARGET generic-connector-api PROPERTY
PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
)
-target_link_libraries(api PUBLIC
+target_link_libraries(generic-connector-api PUBLIC
contrib-libs-cxxsupp
yutil
contrib-libs-grpc
- api-protos
+ connector-api-protos
contrib-libs-protobuf
)
-target_proto_messages(api PRIVATE
+target_proto_messages(generic-connector-api PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/api/connector.proto
)
-target_proto_addincls(api
+target_proto_addincls(generic-connector-api
./
${CMAKE_SOURCE_DIR}/
${CMAKE_BINARY_DIR}
@@ -49,11 +49,11 @@ target_proto_addincls(api
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
)
-target_proto_outs(api
+target_proto_outs(generic-connector-api
--cpp_out=${CMAKE_BINARY_DIR}/
--cpp_styleguide_out=${CMAKE_BINARY_DIR}/
)
-target_proto_plugin(api
+target_proto_plugin(generic-connector-api
grpc_cpp
grpc_cpp
)
diff --git a/ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-aarch64.txt
index dd0638e7bf2..1e9bb96043f 100644
--- a/ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-aarch64.txt
@@ -26,22 +26,22 @@ get_built_tool_path(
cpp_styleguide
)
-add_library(api)
-set_property(TARGET api PROPERTY
+add_library(generic-connector-api)
+set_property(TARGET generic-connector-api PROPERTY
PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
)
-target_link_libraries(api PUBLIC
+target_link_libraries(generic-connector-api PUBLIC
contrib-libs-linux-headers
contrib-libs-cxxsupp
yutil
contrib-libs-grpc
- api-protos
+ connector-api-protos
contrib-libs-protobuf
)
-target_proto_messages(api PRIVATE
+target_proto_messages(generic-connector-api PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/api/connector.proto
)
-target_proto_addincls(api
+target_proto_addincls(generic-connector-api
./
${CMAKE_SOURCE_DIR}/
${CMAKE_BINARY_DIR}
@@ -50,11 +50,11 @@ target_proto_addincls(api
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
)
-target_proto_outs(api
+target_proto_outs(generic-connector-api
--cpp_out=${CMAKE_BINARY_DIR}/
--cpp_styleguide_out=${CMAKE_BINARY_DIR}/
)
-target_proto_plugin(api
+target_proto_plugin(generic-connector-api
grpc_cpp
grpc_cpp
)
diff --git a/ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-x86_64.txt b/ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-x86_64.txt
index dd0638e7bf2..1e9bb96043f 100644
--- a/ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/api/CMakeLists.linux-x86_64.txt
@@ -26,22 +26,22 @@ get_built_tool_path(
cpp_styleguide
)
-add_library(api)
-set_property(TARGET api PROPERTY
+add_library(generic-connector-api)
+set_property(TARGET generic-connector-api PROPERTY
PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
)
-target_link_libraries(api PUBLIC
+target_link_libraries(generic-connector-api PUBLIC
contrib-libs-linux-headers
contrib-libs-cxxsupp
yutil
contrib-libs-grpc
- api-protos
+ connector-api-protos
contrib-libs-protobuf
)
-target_proto_messages(api PRIVATE
+target_proto_messages(generic-connector-api PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/api/connector.proto
)
-target_proto_addincls(api
+target_proto_addincls(generic-connector-api
./
${CMAKE_SOURCE_DIR}/
${CMAKE_BINARY_DIR}
@@ -50,11 +50,11 @@ target_proto_addincls(api
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
)
-target_proto_outs(api
+target_proto_outs(generic-connector-api
--cpp_out=${CMAKE_BINARY_DIR}/
--cpp_styleguide_out=${CMAKE_BINARY_DIR}/
)
-target_proto_plugin(api
+target_proto_plugin(generic-connector-api
grpc_cpp
grpc_cpp
)
diff --git a/ydb/library/yql/providers/generic/connector/api/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/generic/connector/api/CMakeLists.windows-x86_64.txt
index 3fc29347835..fc57461fefa 100644
--- a/ydb/library/yql/providers/generic/connector/api/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/api/CMakeLists.windows-x86_64.txt
@@ -26,21 +26,21 @@ get_built_tool_path(
cpp_styleguide
)
-add_library(api)
-set_property(TARGET api PROPERTY
+add_library(generic-connector-api)
+set_property(TARGET generic-connector-api PROPERTY
PROTOC_EXTRA_OUTS .grpc.pb.cc .grpc.pb.h
)
-target_link_libraries(api PUBLIC
+target_link_libraries(generic-connector-api PUBLIC
contrib-libs-cxxsupp
yutil
contrib-libs-grpc
- api-protos
+ connector-api-protos
contrib-libs-protobuf
)
-target_proto_messages(api PRIVATE
+target_proto_messages(generic-connector-api PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/api/connector.proto
)
-target_proto_addincls(api
+target_proto_addincls(generic-connector-api
./
${CMAKE_SOURCE_DIR}/
${CMAKE_BINARY_DIR}
@@ -49,11 +49,11 @@ target_proto_addincls(api
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
)
-target_proto_outs(api
+target_proto_outs(generic-connector-api
--cpp_out=${CMAKE_BINARY_DIR}/
--cpp_styleguide_out=${CMAKE_BINARY_DIR}/
)
-target_proto_plugin(api
+target_proto_plugin(generic-connector-api
grpc_cpp
grpc_cpp
)
diff --git a/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.darwin-x86_64.txt
index e093480cb69..a5b0c41bd78 100644
--- a/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.darwin-x86_64.txt
@@ -19,17 +19,17 @@ get_built_tool_path(
cpp_styleguide
)
-add_library(api-protos)
-target_link_libraries(api-protos PUBLIC
+add_library(connector-api-protos)
+target_link_libraries(connector-api-protos PUBLIC
contrib-libs-cxxsupp
yutil
api-protos
contrib-libs-protobuf
)
-target_proto_messages(api-protos PRIVATE
+target_proto_messages(connector-api-protos PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/api/protos/connector.proto
)
-target_proto_addincls(api-protos
+target_proto_addincls(connector-api-protos
./
${CMAKE_SOURCE_DIR}/
${CMAKE_BINARY_DIR}
@@ -38,7 +38,7 @@ target_proto_addincls(api-protos
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
)
-target_proto_outs(api-protos
+target_proto_outs(connector-api-protos
--cpp_out=${CMAKE_BINARY_DIR}/
--cpp_styleguide_out=${CMAKE_BINARY_DIR}/
)
diff --git a/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-aarch64.txt
index 34c2c237d33..f428b3ddec4 100644
--- a/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-aarch64.txt
@@ -19,18 +19,18 @@ get_built_tool_path(
cpp_styleguide
)
-add_library(api-protos)
-target_link_libraries(api-protos PUBLIC
+add_library(connector-api-protos)
+target_link_libraries(connector-api-protos PUBLIC
contrib-libs-linux-headers
contrib-libs-cxxsupp
yutil
api-protos
contrib-libs-protobuf
)
-target_proto_messages(api-protos PRIVATE
+target_proto_messages(connector-api-protos PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/api/protos/connector.proto
)
-target_proto_addincls(api-protos
+target_proto_addincls(connector-api-protos
./
${CMAKE_SOURCE_DIR}/
${CMAKE_BINARY_DIR}
@@ -39,7 +39,7 @@ target_proto_addincls(api-protos
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
)
-target_proto_outs(api-protos
+target_proto_outs(connector-api-protos
--cpp_out=${CMAKE_BINARY_DIR}/
--cpp_styleguide_out=${CMAKE_BINARY_DIR}/
)
diff --git a/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-x86_64.txt b/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-x86_64.txt
index 34c2c237d33..f428b3ddec4 100644
--- a/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.linux-x86_64.txt
@@ -19,18 +19,18 @@ get_built_tool_path(
cpp_styleguide
)
-add_library(api-protos)
-target_link_libraries(api-protos PUBLIC
+add_library(connector-api-protos)
+target_link_libraries(connector-api-protos PUBLIC
contrib-libs-linux-headers
contrib-libs-cxxsupp
yutil
api-protos
contrib-libs-protobuf
)
-target_proto_messages(api-protos PRIVATE
+target_proto_messages(connector-api-protos PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/api/protos/connector.proto
)
-target_proto_addincls(api-protos
+target_proto_addincls(connector-api-protos
./
${CMAKE_SOURCE_DIR}/
${CMAKE_BINARY_DIR}
@@ -39,7 +39,7 @@ target_proto_addincls(api-protos
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
)
-target_proto_outs(api-protos
+target_proto_outs(connector-api-protos
--cpp_out=${CMAKE_BINARY_DIR}/
--cpp_styleguide_out=${CMAKE_BINARY_DIR}/
)
diff --git a/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.windows-x86_64.txt
index e093480cb69..a5b0c41bd78 100644
--- a/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/api/protos/CMakeLists.windows-x86_64.txt
@@ -19,17 +19,17 @@ get_built_tool_path(
cpp_styleguide
)
-add_library(api-protos)
-target_link_libraries(api-protos PUBLIC
+add_library(connector-api-protos)
+target_link_libraries(connector-api-protos PUBLIC
contrib-libs-cxxsupp
yutil
api-protos
contrib-libs-protobuf
)
-target_proto_messages(api-protos PRIVATE
+target_proto_messages(connector-api-protos PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/api/protos/connector.proto
)
-target_proto_addincls(api-protos
+target_proto_addincls(connector-api-protos
./
${CMAKE_SOURCE_DIR}/
${CMAKE_BINARY_DIR}
@@ -38,7 +38,7 @@ target_proto_addincls(api-protos
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
)
-target_proto_outs(api-protos
+target_proto_outs(connector-api-protos
--cpp_out=${CMAKE_BINARY_DIR}/
--cpp_styleguide_out=${CMAKE_BINARY_DIR}/
)
diff --git a/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.darwin-x86_64.txt
index 30126e41598..4578636bd8d 100644
--- a/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.darwin-x86_64.txt
@@ -18,7 +18,7 @@ target_link_libraries(generic-connector-libcpp PUBLIC
library-yql-ast
yql-public-issue
library-yql-utils
- api
+ generic-connector-api
)
target_sources(generic-connector-libcpp PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/libcpp/client_grpc.cpp
diff --git a/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-aarch64.txt
index 34923c408f4..dc40e3f62e5 100644
--- a/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-aarch64.txt
@@ -19,7 +19,7 @@ target_link_libraries(generic-connector-libcpp PUBLIC
library-yql-ast
yql-public-issue
library-yql-utils
- api
+ generic-connector-api
)
target_sources(generic-connector-libcpp PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/libcpp/client_grpc.cpp
diff --git a/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-x86_64.txt b/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-x86_64.txt
index 34923c408f4..dc40e3f62e5 100644
--- a/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.linux-x86_64.txt
@@ -19,7 +19,7 @@ target_link_libraries(generic-connector-libcpp PUBLIC
library-yql-ast
yql-public-issue
library-yql-utils
- api
+ generic-connector-api
)
target_sources(generic-connector-libcpp PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/libcpp/client_grpc.cpp
diff --git a/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.windows-x86_64.txt
index 30126e41598..4578636bd8d 100644
--- a/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/providers/generic/connector/libcpp/CMakeLists.windows-x86_64.txt
@@ -18,7 +18,7 @@ target_link_libraries(generic-connector-libcpp PUBLIC
library-yql-ast
yql-public-issue
library-yql-utils
- api
+ generic-connector-api
)
target_sources(generic-connector-libcpp PRIVATE
${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/generic/connector/libcpp/client_grpc.cpp
diff --git a/ydb/library/yql/providers/generic/proto/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/providers/generic/proto/CMakeLists.darwin-x86_64.txt
index 97d03389d67..3eb5e86f97b 100644
--- a/ydb/library/yql/providers/generic/proto/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/providers/generic/proto/CMakeLists.darwin-x86_64.txt
@@ -35,7 +35,7 @@ add_library(providers-generic-proto)
target_link_libraries(providers-generic-proto PUBLIC
contrib-libs-cxxsupp
yutil
- api-protos
+ connector-api-protos
contrib-libs-protobuf
)
target_proto_messages(providers-generic-proto PRIVATE
diff --git a/ydb/library/yql/providers/generic/proto/CMakeLists.linux-aarch64.txt b/ydb/library/yql/providers/generic/proto/CMakeLists.linux-aarch64.txt
index ac8978c56d0..d8e7b08f05f 100644
--- a/ydb/library/yql/providers/generic/proto/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/providers/generic/proto/CMakeLists.linux-aarch64.txt
@@ -36,7 +36,7 @@ target_link_libraries(providers-generic-proto PUBLIC
contrib-libs-linux-headers
contrib-libs-cxxsupp
yutil
- api-protos
+ connector-api-protos
contrib-libs-protobuf
)
target_proto_messages(providers-generic-proto PRIVATE
diff --git a/ydb/library/yql/providers/generic/proto/CMakeLists.linux-x86_64.txt b/ydb/library/yql/providers/generic/proto/CMakeLists.linux-x86_64.txt
index ac8978c56d0..d8e7b08f05f 100644
--- a/ydb/library/yql/providers/generic/proto/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/providers/generic/proto/CMakeLists.linux-x86_64.txt
@@ -36,7 +36,7 @@ target_link_libraries(providers-generic-proto PUBLIC
contrib-libs-linux-headers
contrib-libs-cxxsupp
yutil
- api-protos
+ connector-api-protos
contrib-libs-protobuf
)
target_proto_messages(providers-generic-proto PRIVATE
diff --git a/ydb/library/yql/providers/generic/proto/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/generic/proto/CMakeLists.windows-x86_64.txt
index 97d03389d67..3eb5e86f97b 100644
--- a/ydb/library/yql/providers/generic/proto/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/providers/generic/proto/CMakeLists.windows-x86_64.txt
@@ -35,7 +35,7 @@ add_library(providers-generic-proto)
target_link_libraries(providers-generic-proto PUBLIC
contrib-libs-cxxsupp
yutil
- api-protos
+ connector-api-protos
contrib-libs-protobuf
)
target_proto_messages(providers-generic-proto PRIVATE