diff options
| author | nadya73 <nadya73@yandex-team.com> | 2024-07-30 13:16:23 +0300 |
|---|---|---|
| committer | nadya73 <nadya73@yandex-team.com> | 2024-07-30 14:12:09 +0300 |
| commit | cb13057a00bee6a4c0dd414b44686d3ee5680cba (patch) | |
| tree | 18e155bfc7b614a922f5f3640d8d984579267a11 /library/cpp | |
| parent | d7d99122c63ecaa60d07f3eea7589512ff729aec (diff) | |
| download | ydb-cb13057a00bee6a4c0dd414b44686d3ee5680cba.tar.gz | |
[yt/cpp/mapreduce]Fix build with system protoc, std::string and system stl
Fix build with system protoc, std::string and system stl
8b5b81b2d7855f6b0dcb4bb0583a6408e5b7d3f7
Diffstat (limited to 'library/cpp')
| -rw-r--r-- | library/cpp/protobuf/dynamic_prototype/ya.make | 2 | ||||
| -rw-r--r-- | library/cpp/protobuf/json/ya.make | 2 | ||||
| -rw-r--r-- | library/cpp/protobuf/runtime/ya.make | 9 | ||||
| -rw-r--r-- | library/cpp/protobuf/yql/ya.make | 2 | ||||
| -rw-r--r-- | library/cpp/tdigest/ya.make | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/library/cpp/protobuf/dynamic_prototype/ya.make b/library/cpp/protobuf/dynamic_prototype/ya.make index 3fd883b6a2..ab5727d5d3 100644 --- a/library/cpp/protobuf/dynamic_prototype/ya.make +++ b/library/cpp/protobuf/dynamic_prototype/ya.make @@ -6,7 +6,7 @@ SRCS( ) PEERDIR( - contrib/libs/protobuf + library/cpp/protobuf/runtime ) END() diff --git a/library/cpp/protobuf/json/ya.make b/library/cpp/protobuf/json/ya.make index 9309e341ef..b7b3d27a75 100644 --- a/library/cpp/protobuf/json/ya.make +++ b/library/cpp/protobuf/json/ya.make @@ -14,8 +14,8 @@ SRCS( ) PEERDIR( - contrib/libs/protobuf library/cpp/json + library/cpp/protobuf/runtime library/cpp/protobuf/util library/cpp/protobuf/json/proto library/cpp/string_utils/relaxed_escaper diff --git a/library/cpp/protobuf/runtime/ya.make b/library/cpp/protobuf/runtime/ya.make new file mode 100644 index 0000000000..4ddfe0f8ed --- /dev/null +++ b/library/cpp/protobuf/runtime/ya.make @@ -0,0 +1,9 @@ +LIBRARY() + +IF (USE_VANILLA_PROTOC) + PEERDIR(contrib/libs/protobuf_std) +ELSE() + PEERDIR(contrib/libs/protobuf) +ENDIF() + +END() diff --git a/library/cpp/protobuf/yql/ya.make b/library/cpp/protobuf/yql/ya.make index ed77430e26..070fd399b6 100644 --- a/library/cpp/protobuf/yql/ya.make +++ b/library/cpp/protobuf/yql/ya.make @@ -6,10 +6,10 @@ SRCS( ) PEERDIR( - contrib/libs/protobuf library/cpp/json library/cpp/protobuf/dynamic_prototype library/cpp/protobuf/json + library/cpp/protobuf/runtime library/cpp/string_utils/base64 ) diff --git a/library/cpp/tdigest/ya.make b/library/cpp/tdigest/ya.make index 2546443726..37d4e13a27 100644 --- a/library/cpp/tdigest/ya.make +++ b/library/cpp/tdigest/ya.make @@ -6,7 +6,7 @@ SRCS( ) PEERDIR( - contrib/libs/protobuf + library/cpp/protobuf/runtime ) END() |