diff options
author | bugaevskiy <bugaevskiy@yandex-team.com> | 2022-07-30 03:49:20 +0300 |
---|---|---|
committer | bugaevskiy <bugaevskiy@yandex-team.com> | 2022-07-30 03:49:20 +0300 |
commit | 57a5b6148d642c2fe1a5c24ffcce36cd828b94c9 (patch) | |
tree | 22a725f15ea7b0bddd52c6c3436d199a49e94f1f | |
parent | fcdd96bf4024968386f441f2208b040ffa00eed2 (diff) | |
download | ydb-57a5b6148d642c2fe1a5c24ffcce36cd828b94c9.tar.gz |
Remove boost/crc from metaproject
-rw-r--r-- | CMakeLists.darwin.txt | 1 | ||||
-rw-r--r-- | CMakeLists.linux.txt | 2 | ||||
-rw-r--r-- | contrib/libs/apache/avro/CMakeLists.linux.txt | 1 | ||||
-rw-r--r-- | contrib/restricted/boost/CMakeLists.txt | 1 | ||||
-rw-r--r-- | contrib/restricted/boost/crc/CMakeLists.linux.txt | 19 | ||||
-rw-r--r-- | contrib/restricted/boost/crc/CMakeLists.txt | 14 |
6 files changed, 24 insertions, 14 deletions
diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt index 0082d277f7..f6de83439a 100644 --- a/CMakeLists.darwin.txt +++ b/CMakeLists.darwin.txt @@ -141,7 +141,6 @@ add_subdirectory(contrib/restricted/boost/static_assert) add_subdirectory(contrib/restricted/boost/throw_exception) add_subdirectory(contrib/restricted/boost/array) add_subdirectory(contrib/restricted/boost/bind) -add_subdirectory(contrib/restricted/boost/crc) add_subdirectory(contrib/restricted/boost/integer) add_subdirectory(contrib/restricted/boost/io) add_subdirectory(contrib/restricted/boost/logic) diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt index 8ddb245c0e..8fbe96e7d9 100644 --- a/CMakeLists.linux.txt +++ b/CMakeLists.linux.txt @@ -219,7 +219,6 @@ add_subdirectory(contrib/restricted/boost/static_assert) add_subdirectory(contrib/restricted/boost/throw_exception) add_subdirectory(contrib/restricted/boost/array) add_subdirectory(contrib/restricted/boost/bind) -add_subdirectory(contrib/restricted/boost/crc) add_subdirectory(contrib/restricted/boost/integer) add_subdirectory(contrib/restricted/boost/io) add_subdirectory(contrib/restricted/boost/logic) @@ -954,6 +953,7 @@ 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) diff --git a/contrib/libs/apache/avro/CMakeLists.linux.txt b/contrib/libs/apache/avro/CMakeLists.linux.txt index a6b72527d6..c8e8d9066f 100644 --- a/contrib/libs/apache/avro/CMakeLists.linux.txt +++ b/contrib/libs/apache/avro/CMakeLists.linux.txt @@ -27,6 +27,7 @@ target_link_libraries(libs-apache-avro PUBLIC contrib-libs-cxxsupp contrib-libs-snappy contrib-restricted-boost + restricted-boost-crc boost-libs-iostreams ) target_sources(libs-apache-avro PRIVATE diff --git a/contrib/restricted/boost/CMakeLists.txt b/contrib/restricted/boost/CMakeLists.txt index f2a84e6f5a..4110cd3336 100644 --- a/contrib/restricted/boost/CMakeLists.txt +++ b/contrib/restricted/boost/CMakeLists.txt @@ -19,7 +19,6 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-bind restricted-boost-config restricted-boost-core - restricted-boost-crc restricted-boost-integer restricted-boost-io restricted-boost-logic diff --git a/contrib/restricted/boost/crc/CMakeLists.linux.txt b/contrib/restricted/boost/crc/CMakeLists.linux.txt new file mode 100644 index 0000000000..3629d2b911 --- /dev/null +++ b/contrib/restricted/boost/crc/CMakeLists.linux.txt @@ -0,0 +1,19 @@ + +# 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(restricted-boost-crc INTERFACE) +target_include_directories(restricted-boost-crc INTERFACE + ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/crc/include +) +target_link_libraries(restricted-boost-crc INTERFACE + contrib-libs-cxxsupp + yutil + restricted-boost-config + restricted-boost-integer +) diff --git a/contrib/restricted/boost/crc/CMakeLists.txt b/contrib/restricted/boost/crc/CMakeLists.txt index 3629d2b911..e8c98bfd99 100644 --- a/contrib/restricted/boost/crc/CMakeLists.txt +++ b/contrib/restricted/boost/crc/CMakeLists.txt @@ -6,14 +6,6 @@ # original buildsystem will not be accepted. - -add_library(restricted-boost-crc INTERFACE) -target_include_directories(restricted-boost-crc INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/crc/include -) -target_link_libraries(restricted-boost-crc INTERFACE - contrib-libs-cxxsupp - yutil - restricted-boost-config - restricted-boost-integer -) +if (UNIX AND NOT APPLE) + include(CMakeLists.linux.txt) +endif() |