aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-22 15:22:21 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-22 15:22:21 +0300
commitcb69ebfc910722a9ecfc2234d781f79e4a60fb60 (patch)
tree40adcfcf9bb46885103a78a1a85839293b8766f8
parent7d32d59535c3c2cafd4f033fdabfd43b99049a24 (diff)
downloadydb-cb69ebfc910722a9ecfc2234d781f79e4a60fb60.tar.gz
intermediate changes
ref:b4effc9582e42dfa79e9a44a91df283419947b3a
-rw-r--r--CMakeLists.txt6
-rw-r--r--build/ymake.core.conf4
-rw-r--r--contrib/libs/apache/arrow/CMakeLists.txt3
-rw-r--r--contrib/libs/apache/orc/CMakeLists.txt3
-rw-r--r--contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt3
-rw-r--r--contrib/libs/curl/CMakeLists.txt7
-rw-r--r--contrib/libs/grpc/grpc++/CMakeLists.txt3
-rw-r--r--contrib/libs/grpc/grpc/CMakeLists.txt7
-rw-r--r--contrib/libs/hdr_histogram/CMakeLists.txt3
-rw-r--r--contrib/libs/jwt-cpp/CMakeLists.txt5
-rw-r--r--contrib/libs/libaio/CMakeLists.txt1
-rw-r--r--contrib/libs/libaio/ya.make9
-rw-r--r--contrib/libs/libevent/event_openssl/CMakeLists.txt3
-rw-r--r--contrib/libs/libxml/CMakeLists.txt5
-rw-r--r--contrib/libs/llvm12/lib/Support/CMakeLists.txt3
-rw-r--r--contrib/libs/poco/Crypto/CMakeLists.txt3
-rw-r--r--contrib/libs/poco/Foundation/CMakeLists.txt3
-rw-r--r--contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt3
-rw-r--r--contrib/libs/protobuf/CMakeLists.txt3
-rw-r--r--contrib/restricted/aws/aws-c-cal/CMakeLists.txt3
-rw-r--r--contrib/restricted/aws/s2n/CMakeLists.txt5
-rw-r--r--contrib/restricted/boost/libs/iostreams/CMakeLists.txt3
-rw-r--r--contrib/restricted/thrift/CMakeLists.txt5
-rw-r--r--contrib/tools/python3/src/Modules/CMakeLists.txt5
-rw-r--r--library/cpp/actors/dnscachelib/CMakeLists.txt3
-rw-r--r--library/cpp/actors/dnsresolver/CMakeLists.txt3
-rw-r--r--library/cpp/actors/http/CMakeLists.txt3
-rw-r--r--library/cpp/actors/interconnect/CMakeLists.txt3
-rw-r--r--library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt3
-rw-r--r--library/cpp/charset/CMakeLists.txt3
-rw-r--r--library/cpp/http/fetch/CMakeLists.txt3
-rw-r--r--library/cpp/monlib/encode/spack/CMakeLists.txt3
-rw-r--r--library/cpp/openssl/holders/CMakeLists.txt3
-rw-r--r--library/cpp/openssl/init/CMakeLists.txt3
-rw-r--r--library/cpp/openssl/io/CMakeLists.txt3
-rw-r--r--library/cpp/openssl/method/CMakeLists.txt3
-rw-r--r--library/cpp/unicode/punycode/CMakeLists.txt3
-rw-r--r--library/cpp/uri/CMakeLists.txt3
-rw-r--r--util/CMakeLists.txt3
-rw-r--r--ydb/core/ymq/actor/CMakeLists.txt3
-rw-r--r--ydb/core/ymq/base/CMakeLists.txt3
-rw-r--r--ydb/core/yq/libs/hmac/CMakeLists.txt3
-rw-r--r--ydb/library/http_proxy/authorization/CMakeLists.txt3
-rw-r--r--ydb/library/pdisk_io/CMakeLists.txt4
-rw-r--r--ydb/library/yql/udfs/common/digest/CMakeLists.txt4
45 files changed, 14 insertions, 149 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abfba04995d..3bc3a5f1efb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,13 +19,8 @@ conan_cmake_configure(
GENERATORS cmake_find_package
REQUIRES
bison/3.5.3
- c-ares/1.17.2
- libiconv/1.15
- libidn/1.36
- openssl/1.1.1l
ragel/6.10
yasm/1.3.0
- zlib/1.2.11
IMPORTS
"bin, *yasm* -> ./bin"
"bin, bison* -> ./bin/bison/bin"
@@ -398,7 +393,6 @@ add_subdirectory(library/cpp/digest/argonish/internal/proxies/sse2)
add_subdirectory(library/cpp/digest/argonish/internal/proxies/sse41)
add_subdirectory(library/cpp/digest/argonish/internal/proxies/ssse3)
add_subdirectory(ydb/library/pdisk_io)
-add_subdirectory(contrib/libs/libaio)
add_subdirectory(ydb/library/pdisk_io/protos)
add_subdirectory(ydb/library/wilson)
add_subdirectory(library/cpp/actors/wilson)
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 65eee623d61..0d8bbd32e88 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -2460,10 +2460,10 @@ module LIBRARY: _LIBRARY {
}
when ($CMAKE_PACKAGE != "") {
CMAKE_FIND_PKG=find_package $CMAKE_PACKAGE $CMAKE_FIND_PKG_COMP
- CPP_LIBRARY_SEM=$CONAN_REQUIRE && $CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET && ignored
+ CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE && ignored
}
when ($CONAN_REFERENCE != "") {
- CONAN_REQUIRE=conan_require $CONAN_REFERENCE
+ CONAN_REQUIRE=&& conan_require $CONAN_REFERENCE
CPP_LIBRARY_SEM=$CONAN_REQUIRE && $CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET && ignored
}
when ($OPENSOURCE_EXPORT == "no") {
diff --git a/contrib/libs/apache/arrow/CMakeLists.txt b/contrib/libs/apache/arrow/CMakeLists.txt
index aa40b3dd922..20f336f42f8 100644
--- a/contrib/libs/apache/arrow/CMakeLists.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
add_library(libs-apache-arrow)
target_compile_options(libs-apache-arrow PUBLIC
-DARROW_STATIC
@@ -47,7 +45,6 @@ target_link_libraries(libs-apache-arrow PUBLIC
contrib-libs-snappy
contrib-libs-utf8proc
contrib-libs-xxhash
- ZLIB::ZLIB
contrib-libs-zstd
contrib-restricted-boost
contrib-restricted-fast_float
diff --git a/contrib/libs/apache/orc/CMakeLists.txt b/contrib/libs/apache/orc/CMakeLists.txt
index 2daf3c5578f..70e9663c6dd 100644
--- a/contrib/libs/apache/orc/CMakeLists.txt
+++ b/contrib/libs/apache/orc/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
add_library(libs-apache-orc)
target_include_directories(libs-apache-orc PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/apache/orc/c++/include
@@ -12,7 +10,6 @@ target_link_libraries(libs-apache-orc PUBLIC
contrib-libs-cxxsupp
contrib-libs-lz4
contrib-libs-snappy
- ZLIB::ZLIB
contrib-libs-zstd
contrib-libs-protobuf
)
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
index a54f5380572..8f7e164364c 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(libs-aws-sdk-cpp-aws-cpp-sdk-core)
target_compile_options(libs-aws-sdk-cpp-aws-cpp-sdk-core PRIVATE
-DAWS_CAL_USE_IMPORT_EXPORT
@@ -32,7 +30,6 @@ target_include_directories(libs-aws-sdk-cpp-aws-cpp-sdk-core PRIVATE
target_link_libraries(libs-aws-sdk-cpp-aws-cpp-sdk-core PUBLIC
contrib-libs-cxxsupp
contrib-libs-curl
- OpenSSL::OpenSSL
restricted-aws-aws-c-common
restricted-aws-aws-c-event-stream
)
diff --git a/contrib/libs/curl/CMakeLists.txt b/contrib/libs/curl/CMakeLists.txt
index 9288e61ad4b..8a91f84ab60 100644
--- a/contrib/libs/curl/CMakeLists.txt
+++ b/contrib/libs/curl/CMakeLists.txt
@@ -1,7 +1,3 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-find_package(c-ares)
-
add_library(contrib-libs-curl)
target_compile_options(contrib-libs-curl PUBLIC
-DCURL_STATICLIB
@@ -21,10 +17,7 @@ target_include_directories(contrib-libs-curl PRIVATE
)
target_link_libraries(contrib-libs-curl PUBLIC
contrib-libs-libc_compat
- OpenSSL::OpenSSL
- ZLIB::ZLIB
contrib-libs-nghttp2
- c-ares::c-ares
)
target_sources(contrib-libs-curl PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/altsvc.c
diff --git a/contrib/libs/grpc/grpc++/CMakeLists.txt b/contrib/libs/grpc/grpc++/CMakeLists.txt
index 84a02f1bda5..b7eaacb11fc 100644
--- a/contrib/libs/grpc/grpc++/CMakeLists.txt
+++ b/contrib/libs/grpc/grpc++/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(libs-grpc-grpc++)
target_compile_options(libs-grpc-grpc++ PRIVATE
-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1
@@ -21,7 +19,6 @@ target_link_libraries(libs-grpc-grpc++ PUBLIC
src-core-lib
grpc-third_party-address_sorting
grpc-third_party-upb
- OpenSSL::OpenSSL
abseil-cpp-tstring-y_absl-strings
)
target_sources(libs-grpc-grpc++ PRIVATE
diff --git a/contrib/libs/grpc/grpc/CMakeLists.txt b/contrib/libs/grpc/grpc/CMakeLists.txt
index 18572992939..ec2d41b10f9 100644
--- a/contrib/libs/grpc/grpc/CMakeLists.txt
+++ b/contrib/libs/grpc/grpc/CMakeLists.txt
@@ -1,7 +1,3 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-find_package(c-ares)
-
add_library(libs-grpc-grpc)
target_compile_options(libs-grpc-grpc PRIVATE
-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1
@@ -23,13 +19,10 @@ target_link_libraries(libs-grpc-grpc PUBLIC
contrib-libs-cxxsupp
yutil
certs
- c-ares::c-ares
src-core-lib
grpc-third_party-address_sorting
grpc-third_party-upb
- OpenSSL::OpenSSL
contrib-libs-re2
- ZLIB::ZLIB
abseil-cpp-tstring-y_absl-hash
abseil-cpp-tstring-y_absl-meta
abseil-cpp-tstring-y_absl-status
diff --git a/contrib/libs/hdr_histogram/CMakeLists.txt b/contrib/libs/hdr_histogram/CMakeLists.txt
index 2d987779e85..0e51bb8fabe 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.txt
@@ -1,12 +1,9 @@
-find_package(ZLIB)
-
add_library(contrib-libs-hdr_histogram)
target_include_directories(contrib-libs-hdr_histogram PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/hdr_histogram/src
)
target_link_libraries(contrib-libs-hdr_histogram PUBLIC
contrib-libs-cxxsupp
- ZLIB::ZLIB
)
target_sources(contrib-libs-hdr_histogram PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/hdr_histogram/src/hdr_encoding.c
diff --git a/contrib/libs/jwt-cpp/CMakeLists.txt b/contrib/libs/jwt-cpp/CMakeLists.txt
index 12571feb657..6b742d5a5b9 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.txt
@@ -1,6 +1 @@
-find_package(OpenSSL)
-
add_library(contrib-libs-jwt-cpp INTERFACE)
-target_link_libraries(contrib-libs-jwt-cpp INTERFACE
- OpenSSL::OpenSSL
-)
diff --git a/contrib/libs/libaio/CMakeLists.txt b/contrib/libs/libaio/CMakeLists.txt
deleted file mode 100644
index 7f0a0f12b23..00000000000
--- a/contrib/libs/libaio/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_library(contrib-libs-libaio INTERFACE)
diff --git a/contrib/libs/libaio/ya.make b/contrib/libs/libaio/ya.make
index 3eb09b549bb..6099250bf54 100644
--- a/contrib/libs/libaio/ya.make
+++ b/contrib/libs/libaio/ya.make
@@ -16,6 +16,13 @@ OWNER(
NO_RUNTIME()
+OPENSOURCE_EXPORT_REPLACEMENT(
+ CMAKE AIO
+ CMAKE_TARGET AIO
+)
+
+IF (NOT EXPORT_CMAKE)
+
IF (USE_DYNAMIC_AIO)
PEERDIR(
contrib/libs/libaio/dynamic
@@ -26,6 +33,8 @@ ELSE()
)
ENDIF()
+ENDIF()
+
END()
RECURSE(
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.txt b/contrib/libs/libevent/event_openssl/CMakeLists.txt
index 976898ab8c6..153d58e7b03 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(libs-libevent-event_openssl)
target_compile_options(libs-libevent-event_openssl PRIVATE
-DHAVE_CONFIG_H
@@ -11,7 +9,6 @@ target_include_directories(libs-libevent-event_openssl PRIVATE
)
target_link_libraries(libs-libevent-event_openssl PUBLIC
contrib-libs-libc_compat
- OpenSSL::OpenSSL
)
target_sources(libs-libevent-event_openssl PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/libevent/bufferevent_openssl.c
diff --git a/contrib/libs/libxml/CMakeLists.txt b/contrib/libs/libxml/CMakeLists.txt
index 3efc791fbec..48c2a900d72 100644
--- a/contrib/libs/libxml/CMakeLists.txt
+++ b/contrib/libs/libxml/CMakeLists.txt
@@ -1,6 +1,3 @@
-find_package(Iconv)
-find_package(ZLIB)
-
add_library(contrib-libs-libxml)
target_compile_options(contrib-libs-libxml PUBLIC
-DLIBXML_STATIC
@@ -19,8 +16,6 @@ target_include_directories(contrib-libs-libxml PRIVATE
target_link_libraries(contrib-libs-libxml PUBLIC
contrib-libs-cxxsupp
yutil
- Iconv::Iconv
- ZLIB::ZLIB
library-cpp-charset
)
target_sources(contrib-libs-libxml PRIVATE
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
index d45fe3341b5..7f33557b1f1 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
add_library(llvm12-lib-Support)
target_include_directories(llvm12-lib-Support PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Support
@@ -8,7 +6,6 @@ target_link_libraries(llvm12-lib-Support PUBLIC
contrib-libs-cxxsupp
contrib-libs-llvm12
llvm12-lib-Demangle
- ZLIB::ZLIB
)
target_sources(llvm12-lib-Support PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Support/AArch64TargetParser.cpp
diff --git a/contrib/libs/poco/Crypto/CMakeLists.txt b/contrib/libs/poco/Crypto/CMakeLists.txt
index 39f64a1c98f..eeefc74efc3 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(libs-poco-Crypto)
target_include_directories(libs-poco-Crypto PUBLIC
${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/include
@@ -11,7 +9,6 @@ target_include_directories(libs-poco-Crypto PRIVATE
)
target_link_libraries(libs-poco-Crypto PUBLIC
contrib-libs-cxxsupp
- OpenSSL::OpenSSL
libs-poco-Foundation
)
target_sources(libs-poco-Crypto PRIVATE
diff --git a/contrib/libs/poco/Foundation/CMakeLists.txt b/contrib/libs/poco/Foundation/CMakeLists.txt
index 0b01f82e068..0734c62513d 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
add_library(libs-poco-Foundation)
target_include_directories(libs-poco-Foundation PUBLIC
${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/include
@@ -14,7 +12,6 @@ target_link_libraries(libs-poco-Foundation PUBLIC
contrib-libs-cxxsupp
contrib-libs-double-conversion
contrib-libs-pcre
- ZLIB::ZLIB
)
target_sources(libs-poco-Foundation PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/src/ASCIIEncoding.cpp
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
index c5871b53256..a8d504c02a0 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(libs-poco-NetSSL_OpenSSL)
target_include_directories(libs-poco-NetSSL_OpenSSL PUBLIC
${CMAKE_SOURCE_DIR}/contrib/libs/poco/NetSSL_OpenSSL/include
@@ -14,7 +12,6 @@ target_include_directories(libs-poco-NetSSL_OpenSSL PRIVATE
)
target_link_libraries(libs-poco-NetSSL_OpenSSL PUBLIC
contrib-libs-cxxsupp
- OpenSSL::OpenSSL
libs-poco-Crypto
libs-poco-Foundation
libs-poco-JSON
diff --git a/contrib/libs/protobuf/CMakeLists.txt b/contrib/libs/protobuf/CMakeLists.txt
index 088915599e8..afa8e20ad27 100644
--- a/contrib/libs/protobuf/CMakeLists.txt
+++ b/contrib/libs/protobuf/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
add_library(contrib-libs-protobuf)
target_compile_options(contrib-libs-protobuf PRIVATE
-DHAVE_CONFIG_H
@@ -15,7 +13,6 @@ target_include_directories(contrib-libs-protobuf PRIVATE
target_link_libraries(contrib-libs-protobuf PUBLIC
contrib-libs-cxxsupp
yutil
- ZLIB::ZLIB
)
target_sources(contrib-libs-protobuf PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src/google/protobuf/any.cc
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
index edd43569474..25e35d480df 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(restricted-aws-aws-c-cal)
target_include_directories(restricted-aws-aws-c-cal PUBLIC
${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-cal/include
@@ -8,7 +6,6 @@ target_include_directories(restricted-aws-aws-c-cal PRIVATE
${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-cal/include
)
target_link_libraries(restricted-aws-aws-c-cal PUBLIC
- OpenSSL::OpenSSL
restricted-aws-aws-c-common
)
target_sources(restricted-aws-aws-c-cal PRIVATE
diff --git a/contrib/restricted/aws/s2n/CMakeLists.txt b/contrib/restricted/aws/s2n/CMakeLists.txt
index 0f08a248a19..3ca96f1fa57 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(restricted-aws-s2n)
target_compile_options(restricted-aws-s2n PRIVATE
-DS2N_ADX
@@ -16,9 +14,6 @@ target_include_directories(restricted-aws-s2n PRIVATE
${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n
${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/api
)
-target_link_libraries(restricted-aws-s2n PUBLIC
- OpenSSL::OpenSSL
-)
target_sources(restricted-aws-s2n PRIVATE
${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/sike_r2/sikep434r2_fp_x64_asm.S
${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_aes_gcm.c
diff --git a/contrib/restricted/boost/libs/iostreams/CMakeLists.txt b/contrib/restricted/boost/libs/iostreams/CMakeLists.txt
index 05485b93966..4ae3afb44e8 100644
--- a/contrib/restricted/boost/libs/iostreams/CMakeLists.txt
+++ b/contrib/restricted/boost/libs/iostreams/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
add_library(boost-libs-iostreams)
target_compile_options(boost-libs-iostreams PRIVATE
-DBOOST_ATOMIC_STATIC_LINK=1
@@ -28,7 +26,6 @@ target_include_directories(boost-libs-iostreams PRIVATE
target_link_libraries(boost-libs-iostreams PUBLIC
contrib-libs-cxxsupp
contrib-restricted-boost
- ZLIB::ZLIB
contrib-libs-libbz2
)
target_sources(boost-libs-iostreams PRIVATE
diff --git a/contrib/restricted/thrift/CMakeLists.txt b/contrib/restricted/thrift/CMakeLists.txt
index 1a51a52d127..fa73aad4ac0 100644
--- a/contrib/restricted/thrift/CMakeLists.txt
+++ b/contrib/restricted/thrift/CMakeLists.txt
@@ -1,6 +1,3 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-
add_library(contrib-restricted-thrift)
target_compile_options(contrib-restricted-thrift PRIVATE
-Wno-deprecated-declarations
@@ -18,8 +15,6 @@ target_include_directories(contrib-restricted-thrift PRIVATE
target_link_libraries(contrib-restricted-thrift PUBLIC
contrib-libs-cxxsupp
contrib-libs-libevent
- OpenSSL::OpenSSL
- ZLIB::ZLIB
contrib-restricted-boost
boost-libs-system
boost-libs-thread
diff --git a/contrib/tools/python3/src/Modules/CMakeLists.txt b/contrib/tools/python3/src/Modules/CMakeLists.txt
index e1798727739..769412d6f71 100644
--- a/contrib/tools/python3/src/Modules/CMakeLists.txt
+++ b/contrib/tools/python3/src/Modules/CMakeLists.txt
@@ -1,6 +1,3 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-
add_library(python3-src-Modules)
target_compile_options(python3-src-Modules PRIVATE
-DPy_BUILD_CORE_MODULE
@@ -20,8 +17,6 @@ target_include_directories(python3-src-Modules PRIVATE
target_link_libraries(python3-src-Modules PUBLIC
contrib-libs-expat
contrib-libs-libbz2
- OpenSSL::OpenSSL
- ZLIB::ZLIB
libs-xz-liblzma
contrib-restricted-libffi
)
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.txt b/library/cpp/actors/dnscachelib/CMakeLists.txt
index 9dd2d254351..e193378558c 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(c-ares)
-
add_library(cpp-actors-dnscachelib)
target_link_libraries(cpp-actors-dnscachelib PUBLIC
contrib-libs-cxxsupp
yutil
- c-ares::c-ares
library-cpp-lwtrace
)
target_sources(cpp-actors-dnscachelib PRIVATE
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.txt b/library/cpp/actors/dnsresolver/CMakeLists.txt
index f465734a926..2efc899c073 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(c-ares)
-
add_library(cpp-actors-dnsresolver)
target_include_directories(cpp-actors-dnsresolver PRIVATE
${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include
@@ -8,7 +6,6 @@ target_link_libraries(cpp-actors-dnsresolver PUBLIC
contrib-libs-cxxsupp
yutil
cpp-actors-core
- c-ares::c-ares
)
target_sources(cpp-actors-dnsresolver PRIVATE
${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver.cpp
diff --git a/library/cpp/actors/http/CMakeLists.txt b/library/cpp/actors/http/CMakeLists.txt
index a1e2b6e0c91..f87f816b5a4 100644
--- a/library/cpp/actors/http/CMakeLists.txt
+++ b/library/cpp/actors/http/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(OpenSSL)
-
add_library(cpp-actors-http)
target_link_libraries(cpp-actors-http PUBLIC
contrib-libs-cxxsupp
yutil
- OpenSSL::OpenSSL
cpp-actors-core
cpp-actors-interconnect
library-cpp-dns
diff --git a/library/cpp/actors/interconnect/CMakeLists.txt b/library/cpp/actors/interconnect/CMakeLists.txt
index 62b2b3cc52d..7d5034d6532 100644
--- a/library/cpp/actors/interconnect/CMakeLists.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.txt
@@ -1,11 +1,8 @@
-find_package(OpenSSL)
-
add_library(cpp-actors-interconnect)
target_link_libraries(cpp-actors-interconnect PUBLIC
contrib-libs-cxxsupp
yutil
contrib-libs-libc_compat
- OpenSSL::OpenSSL
cpp-actors-core
cpp-actors-dnscachelib
cpp-actors-dnsresolver
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
index 339dab43cb4..2284756abaf 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(ZLIB)
-
add_library(blockcodecs-codecs-zlib INTERFACE)
target_link_libraries(blockcodecs-codecs-zlib INTERFACE
contrib-libs-cxxsupp
yutil
- ZLIB::ZLIB
cpp-blockcodecs-core
)
diff --git a/library/cpp/charset/CMakeLists.txt b/library/cpp/charset/CMakeLists.txt
index 6cadbc7418b..c4798548213 100644
--- a/library/cpp/charset/CMakeLists.txt
+++ b/library/cpp/charset/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(Iconv)
-
add_library(library-cpp-charset)
target_link_libraries(library-cpp-charset PUBLIC
contrib-libs-cxxsupp
yutil
- Iconv::Iconv
)
target_sources(library-cpp-charset PRIVATE
${CMAKE_SOURCE_DIR}/library/cpp/charset/generated/cp_data.cpp
diff --git a/library/cpp/http/fetch/CMakeLists.txt b/library/cpp/http/fetch/CMakeLists.txt
index 52f844c8d16..bacb742a054 100644
--- a/library/cpp/http/fetch/CMakeLists.txt
+++ b/library/cpp/http/fetch/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(ZLIB)
-
add_library(cpp-http-fetch)
target_link_libraries(cpp-http-fetch PUBLIC
contrib-libs-cxxsupp
yutil
- ZLIB::ZLIB
library-cpp-charset
cpp-digest-md5
cpp-http-misc
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.txt b/library/cpp/monlib/encode/spack/CMakeLists.txt
index e6372ee6513..6c86e8f1a92 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
add_library(monlib-encode-spack)
target_link_libraries(monlib-encode-spack PUBLIC
contrib-libs-cxxsupp
@@ -8,7 +6,6 @@ target_link_libraries(monlib-encode-spack PUBLIC
cpp-monlib-exception
contrib-libs-lz4
contrib-libs-xxhash
- ZLIB::ZLIB
contrib-libs-zstd
)
target_sources(monlib-encode-spack PRIVATE
diff --git a/library/cpp/openssl/holders/CMakeLists.txt b/library/cpp/openssl/holders/CMakeLists.txt
index fa28e789566..756fe120601 100644
--- a/library/cpp/openssl/holders/CMakeLists.txt
+++ b/library/cpp/openssl/holders/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(OpenSSL)
-
add_library(cpp-openssl-holders)
target_link_libraries(cpp-openssl-holders PUBLIC
contrib-libs-cxxsupp
yutil
- OpenSSL::OpenSSL
)
target_sources(cpp-openssl-holders PRIVATE
${CMAKE_SOURCE_DIR}/library/cpp/openssl/holders/bio.cpp
diff --git a/library/cpp/openssl/init/CMakeLists.txt b/library/cpp/openssl/init/CMakeLists.txt
index 3ec2c1ece40..8a008809858 100644
--- a/library/cpp/openssl/init/CMakeLists.txt
+++ b/library/cpp/openssl/init/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(OpenSSL)
-
add_library(cpp-openssl-init)
target_link_libraries(cpp-openssl-init PUBLIC
contrib-libs-cxxsupp
yutil
- OpenSSL::OpenSSL
)
target_sources(cpp-openssl-init PRIVATE
${CMAKE_SOURCE_DIR}/library/cpp/openssl/init/init.cpp
diff --git a/library/cpp/openssl/io/CMakeLists.txt b/library/cpp/openssl/io/CMakeLists.txt
index 7d1369237e1..85dcf3de8f0 100644
--- a/library/cpp/openssl/io/CMakeLists.txt
+++ b/library/cpp/openssl/io/CMakeLists.txt
@@ -1,11 +1,8 @@
-find_package(OpenSSL)
-
add_library(cpp-openssl-io)
target_link_libraries(cpp-openssl-io PUBLIC
contrib-libs-cxxsupp
yutil
certs
- OpenSSL::OpenSSL
cpp-openssl-init
cpp-openssl-method
)
diff --git a/library/cpp/openssl/method/CMakeLists.txt b/library/cpp/openssl/method/CMakeLists.txt
index 729948fc0f0..48ca9063d88 100644
--- a/library/cpp/openssl/method/CMakeLists.txt
+++ b/library/cpp/openssl/method/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(OpenSSL)
-
add_library(cpp-openssl-method)
target_link_libraries(cpp-openssl-method PUBLIC
contrib-libs-cxxsupp
yutil
- OpenSSL::OpenSSL
cpp-openssl-holders
)
target_sources(cpp-openssl-method PRIVATE
diff --git a/library/cpp/unicode/punycode/CMakeLists.txt b/library/cpp/unicode/punycode/CMakeLists.txt
index 9766efd5d13..c70b62349e1 100644
--- a/library/cpp/unicode/punycode/CMakeLists.txt
+++ b/library/cpp/unicode/punycode/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(libidn)
-
add_library(cpp-unicode-punycode)
target_link_libraries(cpp-unicode-punycode PUBLIC
contrib-libs-cxxsupp
yutil
- libidn::libidn
)
target_sources(cpp-unicode-punycode PRIVATE
${CMAKE_SOURCE_DIR}/library/cpp/unicode/punycode/punycode.cpp
diff --git a/library/cpp/uri/CMakeLists.txt b/library/cpp/uri/CMakeLists.txt
index 332a12e9434..f45f76856c1 100644
--- a/library/cpp/uri/CMakeLists.txt
+++ b/library/cpp/uri/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(libidn)
-
add_library(library-cpp-uri)
target_link_libraries(library-cpp-uri PUBLIC
contrib-libs-cxxsupp
yutil
- libidn::libidn
library-cpp-charset
)
target_sources(library-cpp-uri PRIVATE
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
index 77f6e71cf6b..e61a0c6777b 100644
--- a/util/CMakeLists.txt
+++ b/util/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(ZLIB)
-
add_library(yutil)
target_link_libraries(yutil PUBLIC
contrib-libs-cxxsupp
util-charset
- ZLIB::ZLIB
contrib-libs-double-conversion
contrib-libs-libc_compat
)
diff --git a/ydb/core/ymq/actor/CMakeLists.txt b/ydb/core/ymq/actor/CMakeLists.txt
index cab0253e253..cbdde96b1a0 100644
--- a/ydb/core/ymq/actor/CMakeLists.txt
+++ b/ydb/core/ymq/actor/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(core-ymq-actor)
target_compile_options(core-ymq-actor PRIVATE
-DUSE_CURRENT_UDF_ABI_VERSION
@@ -7,7 +5,6 @@ target_compile_options(core-ymq-actor PRIVATE
target_link_libraries(core-ymq-actor PUBLIC
contrib-libs-cxxsupp
yutil
- OpenSSL::OpenSSL
contrib-libs-protobuf
cpp-actors-core
cpp-containers-intrusive_rb_tree
diff --git a/ydb/core/ymq/base/CMakeLists.txt b/ydb/core/ymq/base/CMakeLists.txt
index 36ad5f1bbc5..d8732f27a4f 100644
--- a/ydb/core/ymq/base/CMakeLists.txt
+++ b/ydb/core/ymq/base/CMakeLists.txt
@@ -1,11 +1,8 @@
-find_package(OpenSSL)
-
add_library(core-ymq-base)
target_link_libraries(core-ymq-base PUBLIC
contrib-libs-cxxsupp
yutil
tools-enum_parser-enum_serialization_runtime
- OpenSSL::OpenSSL
library-cpp-cgiparam
library-cpp-ipmath
library-cpp-lwtrace
diff --git a/ydb/core/yq/libs/hmac/CMakeLists.txt b/ydb/core/yq/libs/hmac/CMakeLists.txt
index 60a7ee0d370..0f46a8d9a48 100644
--- a/ydb/core/yq/libs/hmac/CMakeLists.txt
+++ b/ydb/core/yq/libs/hmac/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(OpenSSL)
-
add_library(yq-libs-hmac)
target_link_libraries(yq-libs-hmac PUBLIC
contrib-libs-cxxsupp
yutil
- OpenSSL::OpenSSL
cpp-string_utils-base64
)
target_sources(yq-libs-hmac PRIVATE
diff --git a/ydb/library/http_proxy/authorization/CMakeLists.txt b/ydb/library/http_proxy/authorization/CMakeLists.txt
index 96b2f668678..ccf3aed6686 100644
--- a/ydb/library/http_proxy/authorization/CMakeLists.txt
+++ b/ydb/library/http_proxy/authorization/CMakeLists.txt
@@ -1,10 +1,7 @@
-find_package(OpenSSL)
-
add_library(library-http_proxy-authorization)
target_link_libraries(library-http_proxy-authorization PUBLIC
contrib-libs-cxxsupp
yutil
- OpenSSL::OpenSSL
library-cpp-cgiparam
cpp-http-io
cpp-http-misc
diff --git a/ydb/library/pdisk_io/CMakeLists.txt b/ydb/library/pdisk_io/CMakeLists.txt
index 5a5fdb8d89f..09af6c508e4 100644
--- a/ydb/library/pdisk_io/CMakeLists.txt
+++ b/ydb/library/pdisk_io/CMakeLists.txt
@@ -1,9 +1,11 @@
+find_package(AIO)
+
add_library(ydb-library-pdisk_io)
target_link_libraries(ydb-library-pdisk_io PUBLIC
contrib-libs-cxxsupp
yutil
tools-enum_parser-enum_serialization_runtime
- contrib-libs-libaio
+ AIO
cpp-actors-core
cpp-monlib-dynamic_counters
ydb-core-debug
diff --git a/ydb/library/yql/udfs/common/digest/CMakeLists.txt b/ydb/library/yql/udfs/common/digest/CMakeLists.txt
index ffdb59faf9c..d0975e12cd2 100644
--- a/ydb/library/yql/udfs/common/digest/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/digest/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
add_library(digest_udf INTERFACE)
target_link_libraries(digest_udf INTERFACE
contrib-libs-cxxsupp
@@ -8,7 +6,6 @@ target_link_libraries(digest_udf INTERFACE
public-udf-support
contrib-libs-farmhash
contrib-libs-highwayhash
- OpenSSL::OpenSSL
contrib-libs-xxhash
cpp-digest-argonish
cpp-digest-crc32c
@@ -47,7 +44,6 @@ target_link_libraries(digest_udf.udf PUBLIC
public-udf-support
contrib-libs-farmhash
contrib-libs-highwayhash
- OpenSSL::OpenSSL
contrib-libs-xxhash
cpp-digest-argonish
cpp-digest-crc32c