diff options
author | thegeorg <thegeorg@yandex-team.com> | 2022-12-15 19:25:15 +0300 |
---|---|---|
committer | thegeorg <thegeorg@yandex-team.com> | 2022-12-15 19:25:15 +0300 |
commit | 0c31d97afd7858af5f8f858c8addf91655ca9ccc (patch) | |
tree | 4d8a246db168f7beaafcd06d486c034115c2123d /util | |
parent | d1d5f5e00df0dd6efc00880dd8283477fc643aaf (diff) | |
download | ydb-0c31d97afd7858af5f8f858c8addf91655ca9ccc.tar.gz |
Sync linux-headers instead of using system ones
Diffstat (limited to 'util')
-rw-r--r-- | util/CMakeLists.linux-aarch64.txt | 1 | ||||
-rw-r--r-- | util/CMakeLists.linux.txt | 1 | ||||
-rw-r--r-- | util/charset/CMakeLists.linux-aarch64.txt | 1 | ||||
-rw-r--r-- | util/charset/CMakeLists.linux.txt | 1 | ||||
-rw-r--r-- | util/draft/CMakeLists.darwin.txt | 22 | ||||
-rw-r--r-- | util/draft/CMakeLists.linux-aarch64.txt | 23 | ||||
-rw-r--r-- | util/draft/CMakeLists.linux.txt | 23 | ||||
-rw-r--r-- | util/draft/CMakeLists.txt | 21 |
8 files changed, 79 insertions, 14 deletions
diff --git a/util/CMakeLists.linux-aarch64.txt b/util/CMakeLists.linux-aarch64.txt index bd7b4e0d7b..0a58d62055 100644 --- a/util/CMakeLists.linux-aarch64.txt +++ b/util/CMakeLists.linux-aarch64.txt @@ -16,6 +16,7 @@ target_compile_options(yutil PRIVATE -D_FORTIFY_SOURCE=0 ) target_link_libraries(yutil PUBLIC + contrib-libs-linux-headers contrib-libs-cxxsupp util-charset ZLIB::ZLIB diff --git a/util/CMakeLists.linux.txt b/util/CMakeLists.linux.txt index 7697d6f9c0..7f09444a51 100644 --- a/util/CMakeLists.linux.txt +++ b/util/CMakeLists.linux.txt @@ -15,6 +15,7 @@ target_compile_options(yutil PRIVATE -Wnarrowing ) target_link_libraries(yutil PUBLIC + contrib-libs-linux-headers contrib-libs-cxxsupp util-charset ZLIB::ZLIB diff --git a/util/charset/CMakeLists.linux-aarch64.txt b/util/charset/CMakeLists.linux-aarch64.txt index 1bd6ed957e..a8515a4320 100644 --- a/util/charset/CMakeLists.linux-aarch64.txt +++ b/util/charset/CMakeLists.linux-aarch64.txt @@ -9,6 +9,7 @@ add_library(util-charset) target_link_libraries(util-charset PUBLIC + contrib-libs-linux-headers contrib-libs-cxxsupp ) target_sources(util-charset PRIVATE diff --git a/util/charset/CMakeLists.linux.txt b/util/charset/CMakeLists.linux.txt index 81257887b3..c021ac9b74 100644 --- a/util/charset/CMakeLists.linux.txt +++ b/util/charset/CMakeLists.linux.txt @@ -9,6 +9,7 @@ add_library(util-charset) target_link_libraries(util-charset PUBLIC + contrib-libs-linux-headers contrib-libs-cxxsupp ) target_joined_source(util-charset diff --git a/util/draft/CMakeLists.darwin.txt b/util/draft/CMakeLists.darwin.txt new file mode 100644 index 0000000000..40cb606846 --- /dev/null +++ b/util/draft/CMakeLists.darwin.txt @@ -0,0 +1,22 @@ + +# 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(util-draft) +target_link_libraries(util-draft PUBLIC + contrib-libs-cxxsupp +) +target_sources(util-draft PRIVATE + ${CMAKE_SOURCE_DIR}/util/draft/date.cpp + ${CMAKE_SOURCE_DIR}/util/draft/datetime.cpp + ${CMAKE_SOURCE_DIR}/util/draft/enum.cpp + ${CMAKE_SOURCE_DIR}/util/draft/holder_vector.cpp + ${CMAKE_SOURCE_DIR}/util/draft/ip.cpp + ${CMAKE_SOURCE_DIR}/util/draft/matrix.cpp + ${CMAKE_SOURCE_DIR}/util/draft/memory.cpp +) diff --git a/util/draft/CMakeLists.linux-aarch64.txt b/util/draft/CMakeLists.linux-aarch64.txt new file mode 100644 index 0000000000..ba2005db53 --- /dev/null +++ b/util/draft/CMakeLists.linux-aarch64.txt @@ -0,0 +1,23 @@ + +# 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(util-draft) +target_link_libraries(util-draft PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp +) +target_sources(util-draft PRIVATE + ${CMAKE_SOURCE_DIR}/util/draft/date.cpp + ${CMAKE_SOURCE_DIR}/util/draft/datetime.cpp + ${CMAKE_SOURCE_DIR}/util/draft/enum.cpp + ${CMAKE_SOURCE_DIR}/util/draft/holder_vector.cpp + ${CMAKE_SOURCE_DIR}/util/draft/ip.cpp + ${CMAKE_SOURCE_DIR}/util/draft/matrix.cpp + ${CMAKE_SOURCE_DIR}/util/draft/memory.cpp +) diff --git a/util/draft/CMakeLists.linux.txt b/util/draft/CMakeLists.linux.txt new file mode 100644 index 0000000000..ba2005db53 --- /dev/null +++ b/util/draft/CMakeLists.linux.txt @@ -0,0 +1,23 @@ + +# 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(util-draft) +target_link_libraries(util-draft PUBLIC + contrib-libs-linux-headers + contrib-libs-cxxsupp +) +target_sources(util-draft PRIVATE + ${CMAKE_SOURCE_DIR}/util/draft/date.cpp + ${CMAKE_SOURCE_DIR}/util/draft/datetime.cpp + ${CMAKE_SOURCE_DIR}/util/draft/enum.cpp + ${CMAKE_SOURCE_DIR}/util/draft/holder_vector.cpp + ${CMAKE_SOURCE_DIR}/util/draft/ip.cpp + ${CMAKE_SOURCE_DIR}/util/draft/matrix.cpp + ${CMAKE_SOURCE_DIR}/util/draft/memory.cpp +) diff --git a/util/draft/CMakeLists.txt b/util/draft/CMakeLists.txt index 40cb606846..3e0811fb22 100644 --- a/util/draft/CMakeLists.txt +++ b/util/draft/CMakeLists.txt @@ -6,17 +6,10 @@ # original buildsystem will not be accepted. - -add_library(util-draft) -target_link_libraries(util-draft PUBLIC - contrib-libs-cxxsupp -) -target_sources(util-draft PRIVATE - ${CMAKE_SOURCE_DIR}/util/draft/date.cpp - ${CMAKE_SOURCE_DIR}/util/draft/datetime.cpp - ${CMAKE_SOURCE_DIR}/util/draft/enum.cpp - ${CMAKE_SOURCE_DIR}/util/draft/holder_vector.cpp - ${CMAKE_SOURCE_DIR}/util/draft/ip.cpp - ${CMAKE_SOURCE_DIR}/util/draft/matrix.cpp - ${CMAKE_SOURCE_DIR}/util/draft/memory.cpp -) +if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) + include(CMakeLists.linux-aarch64.txt) +elseif (APPLE) + include(CMakeLists.darwin.txt) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) + include(CMakeLists.linux.txt) +endif() |