diff options
author | robot-piglet <robot-piglet@yandex-team.com> | 2023-03-09 12:42:44 +0300 |
---|---|---|
committer | robot-piglet <robot-piglet@yandex-team.com> | 2023-03-09 12:42:44 +0300 |
commit | 6324d075a5e80b6943b5de6b465b775050fe83df (patch) | |
tree | e02ce32e988042438f64df770a528164ac572879 /library/cpp/malloc | |
parent | 039e25e1597bec288de44e5061c1b84e195add08 (diff) | |
download | ydb-6324d075a5e80b6943b5de6b465b775050fe83df.tar.gz |
Intermediate changes
Diffstat (limited to 'library/cpp/malloc')
-rw-r--r-- | library/cpp/malloc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | library/cpp/malloc/CMakeLists.windows-x86_64.txt | 10 | ||||
-rw-r--r-- | library/cpp/malloc/api/CMakeLists.txt | 2 | ||||
-rw-r--r-- | library/cpp/malloc/api/CMakeLists.windows-x86_64.txt | 16 | ||||
-rw-r--r-- | library/cpp/malloc/system/CMakeLists.txt | 4 | ||||
-rw-r--r-- | library/cpp/malloc/system/CMakeLists.windows-x86_64.txt | 17 |
6 files changed, 50 insertions, 1 deletions
diff --git a/library/cpp/malloc/CMakeLists.txt b/library/cpp/malloc/CMakeLists.txt index 8f8c04afe54..d90657116d0 100644 --- a/library/cpp/malloc/CMakeLists.txt +++ b/library/cpp/malloc/CMakeLists.txt @@ -10,6 +10,8 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT AND include(CMakeLists.linux-aarch64.txt) elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() diff --git a/library/cpp/malloc/CMakeLists.windows-x86_64.txt b/library/cpp/malloc/CMakeLists.windows-x86_64.txt new file mode 100644 index 00000000000..3366d349044 --- /dev/null +++ b/library/cpp/malloc/CMakeLists.windows-x86_64.txt @@ -0,0 +1,10 @@ + +# This file was generated 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_subdirectory(api) +add_subdirectory(system) diff --git a/library/cpp/malloc/api/CMakeLists.txt b/library/cpp/malloc/api/CMakeLists.txt index 8f8c04afe54..d90657116d0 100644 --- a/library/cpp/malloc/api/CMakeLists.txt +++ b/library/cpp/malloc/api/CMakeLists.txt @@ -10,6 +10,8 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT AND include(CMakeLists.linux-aarch64.txt) elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) +elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() diff --git a/library/cpp/malloc/api/CMakeLists.windows-x86_64.txt b/library/cpp/malloc/api/CMakeLists.windows-x86_64.txt new file mode 100644 index 00000000000..db837d83de0 --- /dev/null +++ b/library/cpp/malloc/api/CMakeLists.windows-x86_64.txt @@ -0,0 +1,16 @@ + +# This file was generated 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(cpp-malloc-api) +target_link_libraries(cpp-malloc-api PUBLIC + contrib-libs-cxxsupp +) +target_sources(cpp-malloc-api PRIVATE + ${CMAKE_SOURCE_DIR}/library/cpp/malloc/api/malloc.cpp +) diff --git a/library/cpp/malloc/system/CMakeLists.txt b/library/cpp/malloc/system/CMakeLists.txt index 5bedd04e092..86c4d15dc39 100644 --- a/library/cpp/malloc/system/CMakeLists.txt +++ b/library/cpp/malloc/system/CMakeLists.txt @@ -6,6 +6,8 @@ # original buildsystem will not be accepted. -if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +if (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) + include(CMakeLists.windows-x86_64.txt) +elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) endif() diff --git a/library/cpp/malloc/system/CMakeLists.windows-x86_64.txt b/library/cpp/malloc/system/CMakeLists.windows-x86_64.txt new file mode 100644 index 00000000000..72c039454cb --- /dev/null +++ b/library/cpp/malloc/system/CMakeLists.windows-x86_64.txt @@ -0,0 +1,17 @@ + +# This file was generated 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(cpp-malloc-system) +target_link_libraries(cpp-malloc-system PUBLIC + contrib-libs-cxxsupp + cpp-malloc-api +) +target_sources(cpp-malloc-system PRIVATE + ${CMAKE_SOURCE_DIR}/library/cpp/malloc/system/malloc-info.cpp +) |