diff options
author | bugaevskiy <bugaevskiy@yandex-team.com> | 2022-12-29 15:11:21 +0300 |
---|---|---|
committer | bugaevskiy <bugaevskiy@yandex-team.com> | 2022-12-29 15:11:21 +0300 |
commit | 80c09361cd3952574f1eec85bfd8057277252e90 (patch) | |
tree | 1ebf6228bd31d4ba4c420640ffab8a22fca0d103 /contrib | |
parent | 758fd297e68f550d2943cc0b9a8bd209f7738339 (diff) | |
download | ydb-80c09361cd3952574f1eec85bfd8057277252e90.tar.gz |
Boost metaproject cleanup
Diffstat (limited to 'contrib')
10 files changed, 5 insertions, 103 deletions
diff --git a/contrib/restricted/boost/CMakeLists.darwin.txt b/contrib/restricted/boost/CMakeLists.darwin.txt index 7b77526488..d9dcc6cad6 100644 --- a/contrib/restricted/boost/CMakeLists.darwin.txt +++ b/contrib/restricted/boost/CMakeLists.darwin.txt @@ -93,7 +93,6 @@ add_subdirectory(xpressive) add_library(contrib-restricted-boost INTERFACE) target_link_libraries(contrib-restricted-boost INTERFACE contrib-libs-cxxsupp - restricted-boost-algorithm restricted-boost-array restricted-boost-assert restricted-boost-bind @@ -106,7 +105,6 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-detail restricted-boost-endian restricted-boost-exception - restricted-boost-foreach restricted-boost-function restricted-boost-function_types restricted-boost-fusion @@ -114,19 +112,13 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-intrusive restricted-boost-iterator restricted-boost-lambda - restricted-boost-lexical_cast - restricted-boost-math restricted-boost-move restricted-boost-mpl restricted-boost-multi_array restricted-boost-numeric_conversion restricted-boost-optional - restricted-boost-parameter - restricted-boost-phoenix restricted-boost-predef restricted-boost-preprocessor - restricted-boost-proto - restricted-boost-random restricted-boost-range restricted-boost-smart_ptr restricted-boost-static_assert @@ -141,5 +133,4 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-utility restricted-boost-variant restricted-boost-winapi - restricted-boost-xpressive ) diff --git a/contrib/restricted/boost/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/CMakeLists.linux-aarch64.txt index 217469978f..f3530ce24d 100644 --- a/contrib/restricted/boost/CMakeLists.linux-aarch64.txt +++ b/contrib/restricted/boost/CMakeLists.linux-aarch64.txt @@ -52,7 +52,6 @@ add_subdirectory(multi_array) add_subdirectory(multi_index) add_subdirectory(numeric_conversion) add_subdirectory(optional) -add_subdirectory(parameter) add_subdirectory(phoenix) add_subdirectory(pool) add_subdirectory(predef) @@ -82,13 +81,11 @@ add_subdirectory(utility) add_subdirectory(variant) add_subdirectory(variant2) add_subdirectory(winapi) -add_subdirectory(xpressive) add_library(contrib-restricted-boost INTERFACE) target_link_libraries(contrib-restricted-boost INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp - restricted-boost-algorithm restricted-boost-array restricted-boost-assert restricted-boost-bind @@ -101,7 +98,6 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-detail restricted-boost-endian restricted-boost-exception - restricted-boost-foreach restricted-boost-function restricted-boost-function_types restricted-boost-fusion @@ -109,19 +105,13 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-intrusive restricted-boost-iterator restricted-boost-lambda - restricted-boost-lexical_cast - restricted-boost-math restricted-boost-move restricted-boost-mpl restricted-boost-multi_array restricted-boost-numeric_conversion restricted-boost-optional - restricted-boost-parameter - restricted-boost-phoenix restricted-boost-predef restricted-boost-preprocessor - restricted-boost-proto - restricted-boost-random restricted-boost-range restricted-boost-smart_ptr restricted-boost-static_assert @@ -136,5 +126,4 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-utility restricted-boost-variant restricted-boost-winapi - restricted-boost-xpressive ) diff --git a/contrib/restricted/boost/CMakeLists.linux.txt b/contrib/restricted/boost/CMakeLists.linux.txt index 4fce75dfa4..b1c81a692b 100644 --- a/contrib/restricted/boost/CMakeLists.linux.txt +++ b/contrib/restricted/boost/CMakeLists.linux.txt @@ -94,7 +94,6 @@ add_library(contrib-restricted-boost INTERFACE) target_link_libraries(contrib-restricted-boost INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp - restricted-boost-algorithm restricted-boost-array restricted-boost-assert restricted-boost-bind @@ -107,7 +106,6 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-detail restricted-boost-endian restricted-boost-exception - restricted-boost-foreach restricted-boost-function restricted-boost-function_types restricted-boost-fusion @@ -115,19 +113,13 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-intrusive restricted-boost-iterator restricted-boost-lambda - restricted-boost-lexical_cast - restricted-boost-math restricted-boost-move restricted-boost-mpl restricted-boost-multi_array restricted-boost-numeric_conversion restricted-boost-optional - restricted-boost-parameter - restricted-boost-phoenix restricted-boost-predef restricted-boost-preprocessor - restricted-boost-proto - restricted-boost-random restricted-boost-range restricted-boost-smart_ptr restricted-boost-static_assert @@ -142,5 +134,4 @@ target_link_libraries(contrib-restricted-boost INTERFACE restricted-boost-utility restricted-boost-variant restricted-boost-winapi - restricted-boost-xpressive ) diff --git a/contrib/restricted/boost/parameter/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/parameter/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 9eb03cdf60..0000000000 --- a/contrib/restricted/boost/parameter/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,27 +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(restricted-boost-parameter INTERFACE) -target_include_directories(restricted-boost-parameter INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/parameter/include -) -target_link_libraries(restricted-boost-parameter INTERFACE - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - restricted-boost-config - restricted-boost-core - restricted-boost-detail - restricted-boost-mp11 - restricted-boost-mpl - restricted-boost-optional - restricted-boost-preprocessor - restricted-boost-type_traits - restricted-boost-utility -) diff --git a/contrib/restricted/boost/parameter/CMakeLists.txt b/contrib/restricted/boost/parameter/CMakeLists.txt index 3e0811fb22..79468a5d8d 100644 --- a/contrib/restricted/boost/parameter/CMakeLists.txt +++ b/contrib/restricted/boost/parameter/CMakeLists.txt @@ -6,9 +6,7 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) - include(CMakeLists.linux-aarch64.txt) -elseif (APPLE) +if (APPLE) include(CMakeLists.darwin.txt) elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) include(CMakeLists.linux.txt) diff --git a/contrib/restricted/boost/xpressive/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/xpressive/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 24c63a1ab3..0000000000 --- a/contrib/restricted/boost/xpressive/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,38 +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(restricted-boost-xpressive INTERFACE) -target_include_directories(restricted-boost-xpressive INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/xpressive/include -) -target_link_libraries(restricted-boost-xpressive INTERFACE - contrib-libs-linux-headers - contrib-libs-cxxsupp - restricted-boost-assert - restricted-boost-config - restricted-boost-conversion - restricted-boost-core - restricted-boost-exception - restricted-boost-fusion - restricted-boost-integer - restricted-boost-iterator - restricted-boost-lexical_cast - restricted-boost-mpl - restricted-boost-numeric_conversion - restricted-boost-optional - restricted-boost-preprocessor - restricted-boost-proto - restricted-boost-range - restricted-boost-smart_ptr - restricted-boost-static_assert - restricted-boost-throw_exception - restricted-boost-type_traits - restricted-boost-typeof - restricted-boost-utility -) diff --git a/contrib/restricted/boost/xpressive/CMakeLists.txt b/contrib/restricted/boost/xpressive/CMakeLists.txt index 3e0811fb22..79468a5d8d 100644 --- a/contrib/restricted/boost/xpressive/CMakeLists.txt +++ b/contrib/restricted/boost/xpressive/CMakeLists.txt @@ -6,9 +6,7 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) - include(CMakeLists.linux-aarch64.txt) -elseif (APPLE) +if (APPLE) include(CMakeLists.darwin.txt) elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) include(CMakeLists.linux.txt) diff --git a/contrib/restricted/thrift/CMakeLists.darwin.txt b/contrib/restricted/thrift/CMakeLists.darwin.txt index e378f286e5..29dfc5fd2e 100644 --- a/contrib/restricted/thrift/CMakeLists.darwin.txt +++ b/contrib/restricted/thrift/CMakeLists.darwin.txt @@ -26,9 +26,9 @@ target_link_libraries(contrib-restricted-thrift PUBLIC contrib-libs-libevent OpenSSL::OpenSSL ZLIB::ZLIB - contrib-restricted-boost restricted-boost-interprocess restricted-boost-locale + restricted-boost-math restricted-boost-system restricted-boost-thread ) diff --git a/contrib/restricted/thrift/CMakeLists.linux-aarch64.txt b/contrib/restricted/thrift/CMakeLists.linux-aarch64.txt index 93a7eb70d2..67ef17ea98 100644 --- a/contrib/restricted/thrift/CMakeLists.linux-aarch64.txt +++ b/contrib/restricted/thrift/CMakeLists.linux-aarch64.txt @@ -27,9 +27,9 @@ target_link_libraries(contrib-restricted-thrift PUBLIC contrib-libs-libevent OpenSSL::OpenSSL ZLIB::ZLIB - contrib-restricted-boost restricted-boost-interprocess restricted-boost-locale + restricted-boost-math restricted-boost-system restricted-boost-thread ) diff --git a/contrib/restricted/thrift/CMakeLists.linux.txt b/contrib/restricted/thrift/CMakeLists.linux.txt index 93a7eb70d2..67ef17ea98 100644 --- a/contrib/restricted/thrift/CMakeLists.linux.txt +++ b/contrib/restricted/thrift/CMakeLists.linux.txt @@ -27,9 +27,9 @@ target_link_libraries(contrib-restricted-thrift PUBLIC contrib-libs-libevent OpenSSL::OpenSSL ZLIB::ZLIB - contrib-restricted-boost restricted-boost-interprocess restricted-boost-locale + restricted-boost-math restricted-boost-system restricted-boost-thread ) |