Skip to content

Commit 33f3c4f

Browse files
committed
Fixed OSS executor build
1 parent 42bbb50 commit 33f3c4f

File tree

52 files changed

+243
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+243
-182
lines changed

cmake/common.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ function(_ydb_sdk_add_library Tgt)
199199
$<BUILD_INTERFACE:${YDB_SDK_SOURCE_DIR}/include>
200200
)
201201
target_compile_definitions(${Tgt} ${includeMode}
202-
YDB_SDK_USE_STD_STRING
202+
YDB_SDK_OSS
203203
)
204204
endfunction()
205205

include/ydb-cpp-sdk/client/iam/common/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ _ydb_sdk_add_library(client-iam-types INTERFACE)
22

33
target_link_libraries(client-iam-types
44
INTERFACE
5-
client-ydb_types-credentials
5+
client-types-credentials
66
library-jwt
77
gRPC::grpc++
88
yutil

include/ydb-cpp-sdk/client/types/executor/executor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#endif
66

77
#include <functional>
8+
#include <memory>
89
#include <mutex>
910

1011
namespace NYdb::inline V3 {

src/client/common_client/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ _ydb_sdk_add_library(client-ydb_common_client)
44

55
target_link_libraries(client-ydb_common_client PUBLIC
66
yutil
7-
impl-ydb_internal-common
8-
client-ydb_types-credentials
7+
impl-internal-common
8+
client-types-credentials
99
)
1010

1111
target_sources(client-ydb_common_client PRIVATE

src/client/common_client/impl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ _ydb_sdk_add_library(client-ydb_common_client-impl)
22

33
target_link_libraries(client-ydb_common_client-impl PUBLIC
44
yutil
5-
impl-ydb_internal-grpc_connections
5+
impl-internal-grpc_connections
66
)
77

88
target_sources(client-ydb_common_client-impl PRIVATE

src/client/coordination/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ target_link_libraries(client-ydb_coordination PUBLIC
44
yutil
55
enum_serialization_runtime
66
api-grpc
7-
impl-ydb_internal-make_request
7+
impl-internal-make_request
88
client-ydb_common_client
99
client-ydb_common_client-impl
1010
client-ydb_driver
1111
client-ydb_proto
12-
client-ydb_types
13-
client-ydb_types-status
12+
client-types
13+
client-types-status
1414
)
1515

1616
target_sources(client-ydb_coordination PRIVATE

src/client/datastreams/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ target_link_libraries(client-ydb_datastreams PUBLIC
66
string_utils-url
77
api-grpc-draft
88
library-operation_id
9-
impl-ydb_internal-make_request
9+
impl-internal-make_request
1010
client-ydb_driver
1111
)
1212

src/client/driver/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ _ydb_sdk_add_library(client-ydb_driver)
33
target_link_libraries(client-ydb_driver
44
PUBLIC
55
client-ydb_common_client
6-
client-ydb_types-status
6+
client-types-status
77
PRIVATE
8-
impl-ydb_internal-common
9-
impl-ydb_internal-grpc_connections
8+
impl-internal-common
9+
impl-internal-grpc_connections
1010
client-resources
1111
)
1212

src/client/export/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ target_link_libraries(client-ydb_export PUBLIC
88
client-ydb_common_client-impl
99
client-ydb_driver
1010
client-ydb_proto
11-
client-ydb_types-operation
11+
client-types-operation
1212
)
1313

1414
target_sources(client-ydb_export PRIVATE

src/client/federated_topic/impl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ target_link_libraries(client-ydb_federated_topic-impl PUBLIC
99
persqueue-obfuscate
1010
api-grpc-draft
1111
api-grpc
12-
impl-ydb_internal-make_request
12+
impl-internal-make_request
1313
client-ydb_common_client-impl
1414
client-ydb_driver
1515
client-ydb_topic-impl

0 commit comments

Comments
 (0)