diff options
author | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2022-09-26 08:17:01 +0300 |
---|---|---|
committer | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2022-09-26 08:17:01 +0300 |
commit | 861d329b972f5db9d1cce78ba43bced3cb2bb06e (patch) | |
tree | 8750e046be91fb321a18e1f79e881a9a38c8f34c /library | |
parent | 7e4be6d951751b3da88d4cf2b57559870c56d3ed (diff) | |
download | ydb-861d329b972f5db9d1cce78ba43bced3cb2bb06e.tar.gz |
External build system generator release 10
Update tools: yexport
Diffstat (limited to 'library')
-rw-r--r-- | library/cpp/actors/interconnect/CMakeLists.txt | 2 | ||||
-rw-r--r-- | library/cpp/balloc/lib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | library/cpp/digest/old_crc/CMakeLists.txt | 4 | ||||
-rw-r--r-- | library/cpp/digest/old_crc/gencrc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | library/cpp/lfalloc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | library/cpp/malloc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | library/cpp/malloc/tcmalloc/CMakeLists.txt | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/library/cpp/actors/interconnect/CMakeLists.txt b/library/cpp/actors/interconnect/CMakeLists.txt index dbfe6fa2c4..79468a5d8d 100644 --- a/library/cpp/actors/interconnect/CMakeLists.txt +++ b/library/cpp/actors/interconnect/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/balloc/lib/CMakeLists.txt b/library/cpp/balloc/lib/CMakeLists.txt index dbfe6fa2c4..79468a5d8d 100644 --- a/library/cpp/balloc/lib/CMakeLists.txt +++ b/library/cpp/balloc/lib/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/digest/old_crc/CMakeLists.txt b/library/cpp/digest/old_crc/CMakeLists.txt index dedf7adedd..c764aa0ff7 100644 --- a/library/cpp/digest/old_crc/CMakeLists.txt +++ b/library/cpp/digest/old_crc/CMakeLists.txt @@ -21,9 +21,9 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/library/cpp/digest/old_crc/crc.inc DEPENDS - ${CMAKE_BINARY_DIR}/library/cpp/digest/old_crc/gencrc/gencrc + ${TOOLS_ROOT}/library/cpp/digest/old_crc/gencrc/gencrc COMMAND - ${CMAKE_BINARY_DIR}/library/cpp/digest/old_crc/gencrc/gencrc + ${TOOLS_ROOT}/library/cpp/digest/old_crc/gencrc/gencrc > crc.inc ) diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt index dbfe6fa2c4..79468a5d8d 100644 --- a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt +++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/lfalloc/CMakeLists.txt b/library/cpp/lfalloc/CMakeLists.txt index dbfe6fa2c4..79468a5d8d 100644 --- a/library/cpp/lfalloc/CMakeLists.txt +++ b/library/cpp/lfalloc/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/malloc/CMakeLists.txt b/library/cpp/malloc/CMakeLists.txt index dbfe6fa2c4..79468a5d8d 100644 --- a/library/cpp/malloc/CMakeLists.txt +++ b/library/cpp/malloc/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/malloc/tcmalloc/CMakeLists.txt b/library/cpp/malloc/tcmalloc/CMakeLists.txt index 97368e369c..3c0f983fa5 100644 --- a/library/cpp/malloc/tcmalloc/CMakeLists.txt +++ b/library/cpp/malloc/tcmalloc/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE) +if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) include(CMakeLists.linux.txt) endif() |