fix darwin build

4 files changed, 56 insertions, 100 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index 211e9a1120..2384d98b2c 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -898,6 +898,25 @@ add_subdirectory(ydb/library/yql/providers/clickhouse/actors)
 add_subdirectory(ydb/library/yql/providers/pq/async_io)
 add_subdirectory(ydb/library/yql/providers/pq/gateway/native)
 add_subdirectory(ydb/library/yql/providers/s3/actors)
+add_subdirectory(contrib/libs/poco/Util)
+add_subdirectory(contrib/libs/expat)
+add_subdirectory(contrib/libs/poco/Foundation)
+add_subdirectory(contrib/libs/poco/JSON)
+add_subdirectory(contrib/libs/poco/XML)
+add_subdirectory(ydb/library/yql/providers/s3/compressors)
+add_subdirectory(ydb/library/yql/providers/s3/serializations)
+add_subdirectory(ydb/library/yql/udfs/common/clickhouse/client)
+add_subdirectory(ydb/library/yql/public/udf/support)
+add_subdirectory(contrib/restricted/boost/libs/program_options)
+add_subdirectory(contrib/restricted/cityhash-1.0.2)
+add_subdirectory(contrib/libs/pdqsort)
+add_subdirectory(contrib/restricted/dragonbox)
+add_subdirectory(contrib/libs/poco/Net)
+add_subdirectory(contrib/libs/poco/NetSSL_OpenSSL)
+add_subdirectory(contrib/libs/poco/Crypto)
+add_subdirectory(contrib/libs/apache/avro)
+add_subdirectory(contrib/restricted/boost/crc)
+add_subdirectory(contrib/restricted/boost/libs/iostreams)
 add_subdirectory(ydb/library/yql/providers/solomon/gateway)
 add_subdirectory(ydb/library/yql/providers/solomon/provider)
 add_subdirectory(ydb/library/yql/providers/solomon/expr_nodes)
@@ -921,23 +940,6 @@ add_subdirectory(ydb/library/folder_service/mock)
 add_subdirectory(ydb/library/keys)
 add_subdirectory(ydb/library/yql/parser/pg_wrapper)
 add_subdirectory(ydb/library/yql/sql/pg)
-add_subdirectory(ydb/library/yql/udfs/common/clickhouse/client)
-add_subdirectory(ydb/library/yql/public/udf/support)
-add_subdirectory(contrib/restricted/boost/libs/program_options)
-add_subdirectory(contrib/restricted/cityhash-1.0.2)
-add_subdirectory(contrib/libs/pdqsort)
-add_subdirectory(contrib/restricted/dragonbox)
-add_subdirectory(contrib/libs/poco/Util)
-add_subdirectory(contrib/libs/expat)
-add_subdirectory(contrib/libs/poco/Foundation)
-add_subdirectory(contrib/libs/poco/JSON)
-add_subdirectory(contrib/libs/poco/XML)
-add_subdirectory(contrib/libs/poco/Net)
-add_subdirectory(contrib/libs/poco/NetSSL_OpenSSL)
-add_subdirectory(contrib/libs/poco/Crypto)
-add_subdirectory(contrib/libs/apache/avro)
-add_subdirectory(contrib/restricted/boost/crc)
-add_subdirectory(contrib/restricted/boost/libs/iostreams)
 add_subdirectory(ydb/library/yql/udfs/common/datetime)
 add_subdirectory(library/cpp/timezone_conversion)
 add_subdirectory(ydb/library/yql/udfs/common/datetime2)
@@ -1341,8 +1343,6 @@ add_subdirectory(ydb/library/yql/parser/pg_wrapper/ut)
 add_subdirectory(ydb/library/yql/providers/common/schema)
 add_subdirectory(ydb/library/yql/providers/common/schema/skiff)
 add_subdirectory(ydb/library/yql/providers/common/ut_helpers)
-add_subdirectory(ydb/library/yql/providers/s3/compressors)
-add_subdirectory(ydb/library/yql/providers/s3/serializations)
 add_subdirectory(ydb/library/yql/providers/function/common)
 add_subdirectory(ydb/library/yql/providers/function/expr_nodes)
 add_subdirectory(ydb/library/yql/providers/function/gateway)
diff --git a/ydb/library/yql/providers/s3/actors/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/actors/CMakeLists.darwin.txt
deleted file mode 100644
index 6995c65381..0000000000
--- a/ydb/library/yql/providers/s3/actors/CMakeLists.darwin.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# This file was gererated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(providers-s3-actors)
-target_compile_options(providers-s3-actors PRIVATE
-  -DUSE_CURRENT_UDF_ABI_VERSION
-)
-target_link_libraries(providers-s3-actors PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-xml-document
-  yql-minikql-computation
-  common-token_accessor-client
-  common-schema-mkql
-  yql-public-types
-  dq-actors-compute
-  providers-common-http_gateway
-  providers-s3-proto
-)
-target_sources(providers-s3-actors PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_retry_policy.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_sink_factory.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_source_factory.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp
-)
diff --git a/ydb/library/yql/providers/s3/actors/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/actors/CMakeLists.linux.txt
deleted file mode 100644
index 910d8cab69..0000000000
--- a/ydb/library/yql/providers/s3/actors/CMakeLists.linux.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# This file was gererated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(providers-s3-actors)
-target_compile_options(providers-s3-actors PRIVATE
-  -DUSE_CURRENT_UDF_ABI_VERSION
-)
-target_include_directories(providers-s3-actors PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/clickhouse/client/base
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/clickhouse/client/base/pcg-random
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/clickhouse/client/src
-)
-target_link_libraries(providers-s3-actors PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-fmt
-  libs-poco-Util
-  cpp-string_utils-base64
-  cpp-string_utils-quote
-  cpp-xml-document
-  dq-actors-compute
-  yql-minikql-computation
-  providers-common-http_gateway
-  common-schema-mkql
-  common-token_accessor-client
-  providers-s3-compressors
-  providers-s3-proto
-  providers-s3-range_helpers
-  providers-s3-serializations
-  yql-public-types
-  clickhouse_client_udf
-)
-target_sources(providers-s3-actors PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_retry_policy.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_sink_factory.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_source_factory.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp
-)
diff --git a/ydb/library/yql/providers/s3/actors/CMakeLists.txt b/ydb/library/yql/providers/s3/actors/CMakeLists.txt
index fc7b1ee73c..910d8cab69 100644
--- a/ydb/library/yql/providers/s3/actors/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/actors/CMakeLists.txt
@@ -6,8 +6,40 @@
 # original buildsystem will not be accepted.
 
 
-if (APPLE)
-  include(CMakeLists.darwin.txt)
-elseif (UNIX AND NOT APPLE)
-  include(CMakeLists.linux.txt)
-endif()
+
+add_library(providers-s3-actors)
+target_compile_options(providers-s3-actors PRIVATE
+  -DUSE_CURRENT_UDF_ABI_VERSION
+)
+target_include_directories(providers-s3-actors PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/clickhouse/client/base
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/clickhouse/client/base/pcg-random
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/clickhouse/client/src
+)
+target_link_libraries(providers-s3-actors PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-fmt
+  libs-poco-Util
+  cpp-string_utils-base64
+  cpp-string_utils-quote
+  cpp-xml-document
+  dq-actors-compute
+  yql-minikql-computation
+  providers-common-http_gateway
+  common-schema-mkql
+  common-token_accessor-client
+  providers-s3-compressors
+  providers-s3-proto
+  providers-s3-range_helpers
+  providers-s3-serializations
+  yql-public-types
+  clickhouse_client_udf
+)
+target_sources(providers-s3-actors PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_read_actor.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_retry_policy.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_sink_factory.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_source_factory.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/actors/yql_s3_write_actor.cpp
+)