Intermediate changes

4634 files changed, 3086 insertions, 3086 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin-x86_64.txt
index fa276972cd..fa276972cd 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin-x86_64.txt
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux-x86_64.txt
index fa276972cd..fa276972cd 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux-x86_64.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a211b6e8d..90f600d7c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,9 +46,9 @@ else()
 endif()
 
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 endif()
diff --git a/certs/CMakeLists.darwin.txt b/certs/CMakeLists.darwin-x86_64.txt
index 9ab67fa907..9ab67fa907 100644
--- a/certs/CMakeLists.darwin.txt
+++ b/certs/CMakeLists.darwin-x86_64.txt
diff --git a/certs/CMakeLists.linux.txt b/certs/CMakeLists.linux-x86_64.txt
index 5b25b1d3c2..5b25b1d3c2 100644
--- a/certs/CMakeLists.linux.txt
+++ b/certs/CMakeLists.linux-x86_64.txt
diff --git a/certs/CMakeLists.txt b/certs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/certs/CMakeLists.txt
+++ b/certs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/CMakeLists.darwin.txt b/contrib/libs/CMakeLists.darwin-x86_64.txt
index 8f27501754..8f27501754 100644
--- a/contrib/libs/CMakeLists.darwin.txt
+++ b/contrib/libs/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/CMakeLists.linux.txt b/contrib/libs/CMakeLists.linux-x86_64.txt
index 797ac4fd05..797ac4fd05 100644
--- a/contrib/libs/CMakeLists.linux.txt
+++ b/contrib/libs/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/CMakeLists.txt b/contrib/libs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/CMakeLists.txt
+++ b/contrib/libs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/antlr3_cpp_runtime/CMakeLists.darwin.txt b/contrib/libs/antlr3_cpp_runtime/CMakeLists.darwin-x86_64.txt
index 8818693c62..8818693c62 100644
--- a/contrib/libs/antlr3_cpp_runtime/CMakeLists.darwin.txt
+++ b/contrib/libs/antlr3_cpp_runtime/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/antlr3_cpp_runtime/CMakeLists.linux.txt b/contrib/libs/antlr3_cpp_runtime/CMakeLists.linux-x86_64.txt
index e8fba8e636..e8fba8e636 100644
--- a/contrib/libs/antlr3_cpp_runtime/CMakeLists.linux.txt
+++ b/contrib/libs/antlr3_cpp_runtime/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/antlr3_cpp_runtime/CMakeLists.txt b/contrib/libs/antlr3_cpp_runtime/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/antlr3_cpp_runtime/CMakeLists.txt
+++ b/contrib/libs/antlr3_cpp_runtime/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/apache/arrow/CMakeLists.darwin.txt b/contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt
index dba4c90c1f..dba4c90c1f 100644
--- a/contrib/libs/apache/arrow/CMakeLists.darwin.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/apache/arrow/CMakeLists.linux.txt b/contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt
index b638c396ed..b638c396ed 100644
--- a/contrib/libs/apache/arrow/CMakeLists.linux.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/apache/arrow/CMakeLists.txt b/contrib/libs/apache/arrow/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/apache/arrow/CMakeLists.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/apache/avro/CMakeLists.darwin.txt b/contrib/libs/apache/avro/CMakeLists.darwin-x86_64.txt
index 303febcc15..303febcc15 100644
--- a/contrib/libs/apache/avro/CMakeLists.darwin.txt
+++ b/contrib/libs/apache/avro/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/apache/avro/CMakeLists.linux.txt b/contrib/libs/apache/avro/CMakeLists.linux-x86_64.txt
index 214360c135..214360c135 100644
--- a/contrib/libs/apache/avro/CMakeLists.linux.txt
+++ b/contrib/libs/apache/avro/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/apache/avro/CMakeLists.txt b/contrib/libs/apache/avro/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/apache/avro/CMakeLists.txt
+++ b/contrib/libs/apache/avro/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/apache/orc/CMakeLists.darwin.txt b/contrib/libs/apache/orc/CMakeLists.darwin-x86_64.txt
index 45e01d7a29..45e01d7a29 100644
--- a/contrib/libs/apache/orc/CMakeLists.darwin.txt
+++ b/contrib/libs/apache/orc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/apache/orc/CMakeLists.linux.txt b/contrib/libs/apache/orc/CMakeLists.linux-x86_64.txt
index 1a7d3d48e7..1a7d3d48e7 100644
--- a/contrib/libs/apache/orc/CMakeLists.linux.txt
+++ b/contrib/libs/apache/orc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/apache/orc/CMakeLists.txt b/contrib/libs/apache/orc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/apache/orc/CMakeLists.txt
+++ b/contrib/libs/apache/orc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.darwin.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.darwin-x86_64.txt
index 0330c951be..0330c951be 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.darwin.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.linux.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.linux-x86_64.txt
index fc60527db3..fc60527db3 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.linux.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.darwin.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.darwin-x86_64.txt
index 1b1705649a..1b1705649a 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.darwin.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.linux.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.linux-x86_64.txt
index 114aa69426..114aa69426 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.linux.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/avx2/CMakeLists.darwin.txt b/contrib/libs/base64/avx2/CMakeLists.darwin-x86_64.txt
index b2e29c7a01..b2e29c7a01 100644
--- a/contrib/libs/base64/avx2/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/avx2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/avx2/CMakeLists.linux.txt b/contrib/libs/base64/avx2/CMakeLists.linux-x86_64.txt
index b528c1f599..b528c1f599 100644
--- a/contrib/libs/base64/avx2/CMakeLists.linux.txt
+++ b/contrib/libs/base64/avx2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/avx2/CMakeLists.txt b/contrib/libs/base64/avx2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/avx2/CMakeLists.txt
+++ b/contrib/libs/base64/avx2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/neon32/CMakeLists.darwin.txt b/contrib/libs/base64/neon32/CMakeLists.darwin-x86_64.txt
index a7ec94e9d0..a7ec94e9d0 100644
--- a/contrib/libs/base64/neon32/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/neon32/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/neon32/CMakeLists.linux.txt b/contrib/libs/base64/neon32/CMakeLists.linux-x86_64.txt
index 2b3ad9b62d..2b3ad9b62d 100644
--- a/contrib/libs/base64/neon32/CMakeLists.linux.txt
+++ b/contrib/libs/base64/neon32/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/neon32/CMakeLists.txt b/contrib/libs/base64/neon32/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/neon32/CMakeLists.txt
+++ b/contrib/libs/base64/neon32/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/neon64/CMakeLists.darwin.txt b/contrib/libs/base64/neon64/CMakeLists.darwin-x86_64.txt
index 732c4dd375..732c4dd375 100644
--- a/contrib/libs/base64/neon64/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/neon64/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/neon64/CMakeLists.linux.txt b/contrib/libs/base64/neon64/CMakeLists.linux-x86_64.txt
index e4923670c8..e4923670c8 100644
--- a/contrib/libs/base64/neon64/CMakeLists.linux.txt
+++ b/contrib/libs/base64/neon64/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/neon64/CMakeLists.txt b/contrib/libs/base64/neon64/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/neon64/CMakeLists.txt
+++ b/contrib/libs/base64/neon64/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/plain32/CMakeLists.darwin.txt b/contrib/libs/base64/plain32/CMakeLists.darwin-x86_64.txt
index d06a76d91a..d06a76d91a 100644
--- a/contrib/libs/base64/plain32/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/plain32/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/plain32/CMakeLists.linux.txt b/contrib/libs/base64/plain32/CMakeLists.linux-x86_64.txt
index edca2dcad4..edca2dcad4 100644
--- a/contrib/libs/base64/plain32/CMakeLists.linux.txt
+++ b/contrib/libs/base64/plain32/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/plain32/CMakeLists.txt b/contrib/libs/base64/plain32/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/plain32/CMakeLists.txt
+++ b/contrib/libs/base64/plain32/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/plain64/CMakeLists.darwin.txt b/contrib/libs/base64/plain64/CMakeLists.darwin-x86_64.txt
index 9ccfdf670c..9ccfdf670c 100644
--- a/contrib/libs/base64/plain64/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/plain64/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/plain64/CMakeLists.linux.txt b/contrib/libs/base64/plain64/CMakeLists.linux-x86_64.txt
index 722ac9fd40..722ac9fd40 100644
--- a/contrib/libs/base64/plain64/CMakeLists.linux.txt
+++ b/contrib/libs/base64/plain64/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/plain64/CMakeLists.txt b/contrib/libs/base64/plain64/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/plain64/CMakeLists.txt
+++ b/contrib/libs/base64/plain64/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/base64/ssse3/CMakeLists.darwin.txt b/contrib/libs/base64/ssse3/CMakeLists.darwin-x86_64.txt
index e1d78be6e0..e1d78be6e0 100644
--- a/contrib/libs/base64/ssse3/CMakeLists.darwin.txt
+++ b/contrib/libs/base64/ssse3/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/base64/ssse3/CMakeLists.linux.txt b/contrib/libs/base64/ssse3/CMakeLists.linux-x86_64.txt
index f019ec569f..f019ec569f 100644
--- a/contrib/libs/base64/ssse3/CMakeLists.linux.txt
+++ b/contrib/libs/base64/ssse3/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/base64/ssse3/CMakeLists.txt b/contrib/libs/base64/ssse3/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/base64/ssse3/CMakeLists.txt
+++ b/contrib/libs/base64/ssse3/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/brotli/common/CMakeLists.darwin.txt b/contrib/libs/brotli/common/CMakeLists.darwin-x86_64.txt
index 0acd28e7cd..0acd28e7cd 100644
--- a/contrib/libs/brotli/common/CMakeLists.darwin.txt
+++ b/contrib/libs/brotli/common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/brotli/common/CMakeLists.linux.txt b/contrib/libs/brotli/common/CMakeLists.linux-x86_64.txt
index f40a7896b9..f40a7896b9 100644
--- a/contrib/libs/brotli/common/CMakeLists.linux.txt
+++ b/contrib/libs/brotli/common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/brotli/common/CMakeLists.txt b/contrib/libs/brotli/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/brotli/common/CMakeLists.txt
+++ b/contrib/libs/brotli/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/brotli/dec/CMakeLists.darwin.txt b/contrib/libs/brotli/dec/CMakeLists.darwin-x86_64.txt
index 5d11acad56..5d11acad56 100644
--- a/contrib/libs/brotli/dec/CMakeLists.darwin.txt
+++ b/contrib/libs/brotli/dec/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/brotli/dec/CMakeLists.linux.txt b/contrib/libs/brotli/dec/CMakeLists.linux-x86_64.txt
index 6283846aef..6283846aef 100644
--- a/contrib/libs/brotli/dec/CMakeLists.linux.txt
+++ b/contrib/libs/brotli/dec/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/brotli/dec/CMakeLists.txt b/contrib/libs/brotli/dec/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/brotli/dec/CMakeLists.txt
+++ b/contrib/libs/brotli/dec/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/brotli/enc/CMakeLists.darwin.txt b/contrib/libs/brotli/enc/CMakeLists.darwin-x86_64.txt
index 297dae7533..297dae7533 100644
--- a/contrib/libs/brotli/enc/CMakeLists.darwin.txt
+++ b/contrib/libs/brotli/enc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/brotli/enc/CMakeLists.linux.txt b/contrib/libs/brotli/enc/CMakeLists.linux-x86_64.txt
index 1fd39e4120..1fd39e4120 100644
--- a/contrib/libs/brotli/enc/CMakeLists.linux.txt
+++ b/contrib/libs/brotli/enc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/brotli/enc/CMakeLists.txt b/contrib/libs/brotli/enc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/brotli/enc/CMakeLists.txt
+++ b/contrib/libs/brotli/enc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cctz/CMakeLists.darwin.txt b/contrib/libs/cctz/CMakeLists.darwin-x86_64.txt
index a4e9994f8a..a4e9994f8a 100644
--- a/contrib/libs/cctz/CMakeLists.darwin.txt
+++ b/contrib/libs/cctz/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cctz/CMakeLists.linux.txt b/contrib/libs/cctz/CMakeLists.linux-x86_64.txt
index 5d6f6aabc8..5d6f6aabc8 100644
--- a/contrib/libs/cctz/CMakeLists.linux.txt
+++ b/contrib/libs/cctz/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cctz/CMakeLists.txt b/contrib/libs/cctz/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cctz/CMakeLists.txt
+++ b/contrib/libs/cctz/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cctz/tzdata/CMakeLists.darwin.txt b/contrib/libs/cctz/tzdata/CMakeLists.darwin-x86_64.txt
index 86cdc28b8f..86cdc28b8f 100644
--- a/contrib/libs/cctz/tzdata/CMakeLists.darwin.txt
+++ b/contrib/libs/cctz/tzdata/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cctz/tzdata/CMakeLists.linux.txt b/contrib/libs/cctz/tzdata/CMakeLists.linux-x86_64.txt
index e6a5c8c8a5..e6a5c8c8a5 100644
--- a/contrib/libs/cctz/tzdata/CMakeLists.linux.txt
+++ b/contrib/libs/cctz/tzdata/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cctz/tzdata/CMakeLists.txt b/contrib/libs/cctz/tzdata/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cctz/tzdata/CMakeLists.txt
+++ b/contrib/libs/cctz/tzdata/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/crcutil/CMakeLists.darwin.txt b/contrib/libs/crcutil/CMakeLists.darwin-x86_64.txt
index 0f492532e9..0f492532e9 100644
--- a/contrib/libs/crcutil/CMakeLists.darwin.txt
+++ b/contrib/libs/crcutil/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/crcutil/CMakeLists.linux.txt b/contrib/libs/crcutil/CMakeLists.linux-x86_64.txt
index 24b6c4fac2..24b6c4fac2 100644
--- a/contrib/libs/crcutil/CMakeLists.linux.txt
+++ b/contrib/libs/crcutil/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/crcutil/CMakeLists.txt b/contrib/libs/crcutil/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/crcutil/CMakeLists.txt
+++ b/contrib/libs/crcutil/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/curl/CMakeLists.darwin.txt b/contrib/libs/curl/CMakeLists.darwin-x86_64.txt
index 7a5fb60835..7a5fb60835 100644
--- a/contrib/libs/curl/CMakeLists.darwin.txt
+++ b/contrib/libs/curl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/curl/CMakeLists.linux.txt b/contrib/libs/curl/CMakeLists.linux-x86_64.txt
index 5609bd43b3..5609bd43b3 100644
--- a/contrib/libs/curl/CMakeLists.linux.txt
+++ b/contrib/libs/curl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/curl/CMakeLists.txt b/contrib/libs/curl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/curl/CMakeLists.txt
+++ b/contrib/libs/curl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/CMakeLists.darwin-x86_64.txt
index 231e81c8ee..231e81c8ee 100644
--- a/contrib/libs/cxxsupp/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/CMakeLists.linux.txt b/contrib/libs/cxxsupp/CMakeLists.linux-x86_64.txt
index ea5f7a2498..ea5f7a2498 100644
--- a/contrib/libs/cxxsupp/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/CMakeLists.txt b/contrib/libs/cxxsupp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/builtins/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/builtins/CMakeLists.darwin-x86_64.txt
index dfe59125b5..dfe59125b5 100644
--- a/contrib/libs/cxxsupp/builtins/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/builtins/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/builtins/CMakeLists.linux.txt b/contrib/libs/cxxsupp/builtins/CMakeLists.linux-x86_64.txt
index b4d38acc9d..b4d38acc9d 100644
--- a/contrib/libs/cxxsupp/builtins/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/builtins/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/builtins/CMakeLists.txt b/contrib/libs/cxxsupp/builtins/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/builtins/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/builtins/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/libcxx/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.darwin-x86_64.txt
index b1aef2a37a..b1aef2a37a 100644
--- a/contrib/libs/cxxsupp/libcxx/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/libcxx/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxx/CMakeLists.linux.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.linux-x86_64.txt
index edaf849b79..edaf849b79 100644
--- a/contrib/libs/cxxsupp/libcxx/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/libcxx/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.darwin-x86_64.txt
index 22f534fcdd..22f534fcdd 100644
--- a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.linux.txt b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.linux-x86_64.txt
index 144c793693..144c793693 100644
--- a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.darwin.txt b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.darwin-x86_64.txt
index 1a5dff5718..1a5dff5718 100644
--- a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.darwin.txt
+++ b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.linux.txt b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.linux-x86_64.txt
index e6b6dbf847..e6b6dbf847 100644
--- a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.linux.txt
+++ b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt
+++ b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/double-conversion/CMakeLists.darwin.txt b/contrib/libs/double-conversion/CMakeLists.darwin-x86_64.txt
index 69a5bc6b49..69a5bc6b49 100644
--- a/contrib/libs/double-conversion/CMakeLists.darwin.txt
+++ b/contrib/libs/double-conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/double-conversion/CMakeLists.linux.txt b/contrib/libs/double-conversion/CMakeLists.linux-x86_64.txt
index 7599b38c4d..7599b38c4d 100644
--- a/contrib/libs/double-conversion/CMakeLists.linux.txt
+++ b/contrib/libs/double-conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/double-conversion/CMakeLists.txt b/contrib/libs/double-conversion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/double-conversion/CMakeLists.txt
+++ b/contrib/libs/double-conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/expat/CMakeLists.darwin.txt b/contrib/libs/expat/CMakeLists.darwin-x86_64.txt
index 374256f11f..374256f11f 100644
--- a/contrib/libs/expat/CMakeLists.darwin.txt
+++ b/contrib/libs/expat/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/expat/CMakeLists.linux.txt b/contrib/libs/expat/CMakeLists.linux-x86_64.txt
index 6962df9bdb..6962df9bdb 100644
--- a/contrib/libs/expat/CMakeLists.linux.txt
+++ b/contrib/libs/expat/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/expat/CMakeLists.txt b/contrib/libs/expat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/expat/CMakeLists.txt
+++ b/contrib/libs/expat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/farmhash/CMakeLists.darwin.txt b/contrib/libs/farmhash/CMakeLists.darwin-x86_64.txt
index aeb7bb29c0..aeb7bb29c0 100644
--- a/contrib/libs/farmhash/CMakeLists.darwin.txt
+++ b/contrib/libs/farmhash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/farmhash/CMakeLists.linux.txt b/contrib/libs/farmhash/CMakeLists.linux-x86_64.txt
index e4fa621f99..e4fa621f99 100644
--- a/contrib/libs/farmhash/CMakeLists.linux.txt
+++ b/contrib/libs/farmhash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/farmhash/CMakeLists.txt b/contrib/libs/farmhash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/farmhash/CMakeLists.txt
+++ b/contrib/libs/farmhash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/farmhash/arch/sse41/CMakeLists.darwin.txt b/contrib/libs/farmhash/arch/sse41/CMakeLists.darwin-x86_64.txt
index 921c50874e..921c50874e 100644
--- a/contrib/libs/farmhash/arch/sse41/CMakeLists.darwin.txt
+++ b/contrib/libs/farmhash/arch/sse41/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse41/CMakeLists.linux.txt b/contrib/libs/farmhash/arch/sse41/CMakeLists.linux-x86_64.txt
index d39e6b6a78..d39e6b6a78 100644
--- a/contrib/libs/farmhash/arch/sse41/CMakeLists.linux.txt
+++ b/contrib/libs/farmhash/arch/sse41/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse41/CMakeLists.txt b/contrib/libs/farmhash/arch/sse41/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/farmhash/arch/sse41/CMakeLists.txt
+++ b/contrib/libs/farmhash/arch/sse41/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/farmhash/arch/sse42/CMakeLists.darwin.txt b/contrib/libs/farmhash/arch/sse42/CMakeLists.darwin-x86_64.txt
index 92f77b4d9a..92f77b4d9a 100644
--- a/contrib/libs/farmhash/arch/sse42/CMakeLists.darwin.txt
+++ b/contrib/libs/farmhash/arch/sse42/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse42/CMakeLists.linux.txt b/contrib/libs/farmhash/arch/sse42/CMakeLists.linux-x86_64.txt
index a9197f9c43..a9197f9c43 100644
--- a/contrib/libs/farmhash/arch/sse42/CMakeLists.linux.txt
+++ b/contrib/libs/farmhash/arch/sse42/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse42/CMakeLists.txt b/contrib/libs/farmhash/arch/sse42/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/farmhash/arch/sse42/CMakeLists.txt
+++ b/contrib/libs/farmhash/arch/sse42/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.darwin.txt b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.darwin-x86_64.txt
index c73d04f960..c73d04f960 100644
--- a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.darwin.txt
+++ b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.linux.txt b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.linux-x86_64.txt
index b0bb6a5860..b0bb6a5860 100644
--- a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.linux.txt
+++ b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.txt b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.txt
+++ b/contrib/libs/farmhash/arch/sse42_aesni/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/fastlz/CMakeLists.darwin.txt b/contrib/libs/fastlz/CMakeLists.darwin-x86_64.txt
index eab41c060a..eab41c060a 100644
--- a/contrib/libs/fastlz/CMakeLists.darwin.txt
+++ b/contrib/libs/fastlz/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/fastlz/CMakeLists.linux.txt b/contrib/libs/fastlz/CMakeLists.linux-x86_64.txt
index e6a67c5372..e6a67c5372 100644
--- a/contrib/libs/fastlz/CMakeLists.linux.txt
+++ b/contrib/libs/fastlz/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/fastlz/CMakeLists.txt b/contrib/libs/fastlz/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/fastlz/CMakeLists.txt
+++ b/contrib/libs/fastlz/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/fmt/CMakeLists.darwin.txt b/contrib/libs/fmt/CMakeLists.darwin-x86_64.txt
index a9d78d7599..a9d78d7599 100644
--- a/contrib/libs/fmt/CMakeLists.darwin.txt
+++ b/contrib/libs/fmt/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/fmt/CMakeLists.linux.txt b/contrib/libs/fmt/CMakeLists.linux-x86_64.txt
index 0bff6a51f6..0bff6a51f6 100644
--- a/contrib/libs/fmt/CMakeLists.linux.txt
+++ b/contrib/libs/fmt/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/fmt/CMakeLists.txt b/contrib/libs/fmt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/fmt/CMakeLists.txt
+++ b/contrib/libs/fmt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/googleapis-common-protos/CMakeLists.darwin.txt b/contrib/libs/googleapis-common-protos/CMakeLists.darwin-x86_64.txt
index a88074fd9d..a88074fd9d 100644
--- a/contrib/libs/googleapis-common-protos/CMakeLists.darwin.txt
+++ b/contrib/libs/googleapis-common-protos/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/googleapis-common-protos/CMakeLists.linux.txt b/contrib/libs/googleapis-common-protos/CMakeLists.linux-x86_64.txt
index a98aba7303..a98aba7303 100644
--- a/contrib/libs/googleapis-common-protos/CMakeLists.linux.txt
+++ b/contrib/libs/googleapis-common-protos/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/googleapis-common-protos/CMakeLists.txt b/contrib/libs/googleapis-common-protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/googleapis-common-protos/CMakeLists.txt
+++ b/contrib/libs/googleapis-common-protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/grpc/CMakeLists.darwin.txt b/contrib/libs/grpc/CMakeLists.darwin-x86_64.txt
index 011ef6a6c8..011ef6a6c8 100644
--- a/contrib/libs/grpc/CMakeLists.darwin.txt
+++ b/contrib/libs/grpc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/grpc/CMakeLists.linux.txt b/contrib/libs/grpc/CMakeLists.linux-x86_64.txt
index f8cfeeb41d..f8cfeeb41d 100644
--- a/contrib/libs/grpc/CMakeLists.linux.txt
+++ b/contrib/libs/grpc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/grpc/CMakeLists.txt b/contrib/libs/grpc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/grpc/CMakeLists.txt
+++ b/contrib/libs/grpc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.darwin.txt b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.darwin-x86_64.txt
index c075387f00..c075387f00 100644
--- a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.darwin.txt
+++ b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.linux.txt b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.linux-x86_64.txt
index 5d50080edc..5d50080edc 100644
--- a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.linux.txt
+++ b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.txt b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.txt
+++ b/contrib/libs/grpc/src/compiler/grpc_plugin_support/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.darwin.txt b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.darwin-x86_64.txt
index 769add5f8b..769add5f8b 100644
--- a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.darwin.txt
+++ b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.linux.txt b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.linux-x86_64.txt
index 5df7d10867..5df7d10867 100644
--- a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.linux.txt
+++ b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.txt b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/grpc/third_party/address_sorting/CMakeLists.txt
+++ b/contrib/libs/grpc/third_party/address_sorting/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/grpc/third_party/upb/CMakeLists.darwin.txt b/contrib/libs/grpc/third_party/upb/CMakeLists.darwin-x86_64.txt
index 2978b68ec9..2978b68ec9 100644
--- a/contrib/libs/grpc/third_party/upb/CMakeLists.darwin.txt
+++ b/contrib/libs/grpc/third_party/upb/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/grpc/third_party/upb/CMakeLists.linux.txt b/contrib/libs/grpc/third_party/upb/CMakeLists.linux-x86_64.txt
index 61de386d30..61de386d30 100644
--- a/contrib/libs/grpc/third_party/upb/CMakeLists.linux.txt
+++ b/contrib/libs/grpc/third_party/upb/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/grpc/third_party/upb/CMakeLists.txt b/contrib/libs/grpc/third_party/upb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/grpc/third_party/upb/CMakeLists.txt
+++ b/contrib/libs/grpc/third_party/upb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hdr_histogram/CMakeLists.darwin.txt b/contrib/libs/hdr_histogram/CMakeLists.darwin-x86_64.txt
index 8cc336fdd1..8cc336fdd1 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.darwin.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hdr_histogram/CMakeLists.linux.txt b/contrib/libs/hdr_histogram/CMakeLists.linux-x86_64.txt
index baa66b76fe..baa66b76fe 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.linux.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hdr_histogram/CMakeLists.txt b/contrib/libs/hdr_histogram/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/highwayhash/CMakeLists.darwin.txt b/contrib/libs/highwayhash/CMakeLists.darwin-x86_64.txt
index 984a14ba7c..984a14ba7c 100644
--- a/contrib/libs/highwayhash/CMakeLists.darwin.txt
+++ b/contrib/libs/highwayhash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/highwayhash/CMakeLists.linux.txt b/contrib/libs/highwayhash/CMakeLists.linux-x86_64.txt
index 8cffe39028..8cffe39028 100644
--- a/contrib/libs/highwayhash/CMakeLists.linux.txt
+++ b/contrib/libs/highwayhash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/highwayhash/CMakeLists.txt b/contrib/libs/highwayhash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/highwayhash/CMakeLists.txt
+++ b/contrib/libs/highwayhash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/highwayhash/arch/CMakeLists.darwin.txt b/contrib/libs/highwayhash/arch/CMakeLists.darwin-x86_64.txt
index 3877a3a7da..3877a3a7da 100644
--- a/contrib/libs/highwayhash/arch/CMakeLists.darwin.txt
+++ b/contrib/libs/highwayhash/arch/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/CMakeLists.linux.txt b/contrib/libs/highwayhash/arch/CMakeLists.linux-x86_64.txt
index 3877a3a7da..3877a3a7da 100644
--- a/contrib/libs/highwayhash/arch/CMakeLists.linux.txt
+++ b/contrib/libs/highwayhash/arch/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/CMakeLists.txt b/contrib/libs/highwayhash/arch/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/highwayhash/arch/CMakeLists.txt
+++ b/contrib/libs/highwayhash/arch/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/highwayhash/arch/avx2/CMakeLists.darwin.txt b/contrib/libs/highwayhash/arch/avx2/CMakeLists.darwin-x86_64.txt
index d98bd38fb8..d98bd38fb8 100644
--- a/contrib/libs/highwayhash/arch/avx2/CMakeLists.darwin.txt
+++ b/contrib/libs/highwayhash/arch/avx2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/avx2/CMakeLists.linux.txt b/contrib/libs/highwayhash/arch/avx2/CMakeLists.linux-x86_64.txt
index 502e383f49..502e383f49 100644
--- a/contrib/libs/highwayhash/arch/avx2/CMakeLists.linux.txt
+++ b/contrib/libs/highwayhash/arch/avx2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/avx2/CMakeLists.txt b/contrib/libs/highwayhash/arch/avx2/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/highwayhash/arch/avx2/CMakeLists.txt
+++ b/contrib/libs/highwayhash/arch/avx2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/highwayhash/arch/sse41/CMakeLists.darwin.txt b/contrib/libs/highwayhash/arch/sse41/CMakeLists.darwin-x86_64.txt
index 644e629a9c..644e629a9c 100644
--- a/contrib/libs/highwayhash/arch/sse41/CMakeLists.darwin.txt
+++ b/contrib/libs/highwayhash/arch/sse41/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/sse41/CMakeLists.linux.txt b/contrib/libs/highwayhash/arch/sse41/CMakeLists.linux-x86_64.txt
index 52b6a35b11..52b6a35b11 100644
--- a/contrib/libs/highwayhash/arch/sse41/CMakeLists.linux.txt
+++ b/contrib/libs/highwayhash/arch/sse41/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/highwayhash/arch/sse41/CMakeLists.txt b/contrib/libs/highwayhash/arch/sse41/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/highwayhash/arch/sse41/CMakeLists.txt
+++ b/contrib/libs/highwayhash/arch/sse41/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/CMakeLists.darwin.txt b/contrib/libs/hyperscan/CMakeLists.darwin-x86_64.txt
index 8576e86aab..8576e86aab 100644
--- a/contrib/libs/hyperscan/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/CMakeLists.linux.txt b/contrib/libs/hyperscan/CMakeLists.linux-x86_64.txt
index 06e680fc7e..06e680fc7e 100644
--- a/contrib/libs/hyperscan/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/CMakeLists.txt b/contrib/libs/hyperscan/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/CMakeLists.txt
+++ b/contrib/libs/hyperscan/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.darwin.txt b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.darwin-x86_64.txt
index 85764417b7..85764417b7 100644
--- a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.linux.txt b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.linux-x86_64.txt
index 8bae602102..8bae602102 100644
--- a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.txt b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.txt
+++ b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.darwin.txt b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.darwin-x86_64.txt
index e11134a46a..e11134a46a 100644
--- a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.linux.txt b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.linux-x86_64.txt
index 411a9453a3..411a9453a3 100644
--- a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.txt b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.txt
+++ b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/runtime_core2/CMakeLists.darwin.txt b/contrib/libs/hyperscan/runtime_core2/CMakeLists.darwin-x86_64.txt
index 63b5a33989..63b5a33989 100644
--- a/contrib/libs/hyperscan/runtime_core2/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/runtime_core2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_core2/CMakeLists.linux.txt b/contrib/libs/hyperscan/runtime_core2/CMakeLists.linux-x86_64.txt
index 9bb42a05f9..9bb42a05f9 100644
--- a/contrib/libs/hyperscan/runtime_core2/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/runtime_core2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_core2/CMakeLists.txt b/contrib/libs/hyperscan/runtime_core2/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/runtime_core2/CMakeLists.txt
+++ b/contrib/libs/hyperscan/runtime_core2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.darwin.txt b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.darwin-x86_64.txt
index c3088fa842..c3088fa842 100644
--- a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.darwin.txt
+++ b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.linux.txt b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.linux-x86_64.txt
index c1878d2ffc..c1878d2ffc 100644
--- a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.linux.txt
+++ b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.txt b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.txt
+++ b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/icu/CMakeLists.darwin.txt b/contrib/libs/icu/CMakeLists.darwin-x86_64.txt
index 6e164c5f6a..6e164c5f6a 100644
--- a/contrib/libs/icu/CMakeLists.darwin.txt
+++ b/contrib/libs/icu/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/icu/CMakeLists.linux.txt b/contrib/libs/icu/CMakeLists.linux-x86_64.txt
index 420ab30dd3..420ab30dd3 100644
--- a/contrib/libs/icu/CMakeLists.linux.txt
+++ b/contrib/libs/icu/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/icu/CMakeLists.txt b/contrib/libs/icu/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/icu/CMakeLists.txt
+++ b/contrib/libs/icu/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/jemalloc/CMakeLists.darwin.txt b/contrib/libs/jemalloc/CMakeLists.darwin-x86_64.txt
index 8e041153f2..8e041153f2 100644
--- a/contrib/libs/jemalloc/CMakeLists.darwin.txt
+++ b/contrib/libs/jemalloc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/jemalloc/CMakeLists.linux.txt b/contrib/libs/jemalloc/CMakeLists.linux-x86_64.txt
index e06c0a57bd..e06c0a57bd 100644
--- a/contrib/libs/jemalloc/CMakeLists.linux.txt
+++ b/contrib/libs/jemalloc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/jemalloc/CMakeLists.txt b/contrib/libs/jemalloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/jemalloc/CMakeLists.txt
+++ b/contrib/libs/jemalloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/jwt-cpp/CMakeLists.darwin.txt b/contrib/libs/jwt-cpp/CMakeLists.darwin-x86_64.txt
index 84e3c97df1..84e3c97df1 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.darwin.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/jwt-cpp/CMakeLists.linux.txt b/contrib/libs/jwt-cpp/CMakeLists.linux-x86_64.txt
index 26b43ddf09..26b43ddf09 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.linux.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/jwt-cpp/CMakeLists.txt b/contrib/libs/jwt-cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libbz2/CMakeLists.darwin.txt b/contrib/libs/libbz2/CMakeLists.darwin-x86_64.txt
index f5bcb4e658..f5bcb4e658 100644
--- a/contrib/libs/libbz2/CMakeLists.darwin.txt
+++ b/contrib/libs/libbz2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libbz2/CMakeLists.linux.txt b/contrib/libs/libbz2/CMakeLists.linux-x86_64.txt
index 865cd53d18..865cd53d18 100644
--- a/contrib/libs/libbz2/CMakeLists.linux.txt
+++ b/contrib/libs/libbz2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libbz2/CMakeLists.txt b/contrib/libs/libbz2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libbz2/CMakeLists.txt
+++ b/contrib/libs/libbz2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libc_compat/CMakeLists.darwin.txt b/contrib/libs/libc_compat/CMakeLists.darwin-x86_64.txt
index 536ee46c8b..536ee46c8b 100644
--- a/contrib/libs/libc_compat/CMakeLists.darwin.txt
+++ b/contrib/libs/libc_compat/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libc_compat/CMakeLists.linux.txt b/contrib/libs/libc_compat/CMakeLists.linux-x86_64.txt
index 66727f3e3e..66727f3e3e 100644
--- a/contrib/libs/libc_compat/CMakeLists.linux.txt
+++ b/contrib/libs/libc_compat/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libc_compat/CMakeLists.txt b/contrib/libs/libc_compat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libc_compat/CMakeLists.txt
+++ b/contrib/libs/libc_compat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/CMakeLists.darwin.txt b/contrib/libs/libevent/CMakeLists.darwin-x86_64.txt
index 6b663371d0..6b663371d0 100644
--- a/contrib/libs/libevent/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/CMakeLists.linux.txt b/contrib/libs/libevent/CMakeLists.linux-x86_64.txt
index c718ec93e5..c718ec93e5 100644
--- a/contrib/libs/libevent/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/CMakeLists.txt b/contrib/libs/libevent/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/CMakeLists.txt
+++ b/contrib/libs/libevent/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/event_core/CMakeLists.darwin.txt b/contrib/libs/libevent/event_core/CMakeLists.darwin-x86_64.txt
index 76257b1032..76257b1032 100644
--- a/contrib/libs/libevent/event_core/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/event_core/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/event_core/CMakeLists.linux.txt b/contrib/libs/libevent/event_core/CMakeLists.linux-x86_64.txt
index 58dc143881..58dc143881 100644
--- a/contrib/libs/libevent/event_core/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/event_core/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/event_core/CMakeLists.txt b/contrib/libs/libevent/event_core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/event_core/CMakeLists.txt
+++ b/contrib/libs/libevent/event_core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/event_extra/CMakeLists.darwin.txt b/contrib/libs/libevent/event_extra/CMakeLists.darwin-x86_64.txt
index 18fe1e7a8b..18fe1e7a8b 100644
--- a/contrib/libs/libevent/event_extra/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/event_extra/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/event_extra/CMakeLists.linux.txt b/contrib/libs/libevent/event_extra/CMakeLists.linux-x86_64.txt
index 04bb8460ed..04bb8460ed 100644
--- a/contrib/libs/libevent/event_extra/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/event_extra/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/event_extra/CMakeLists.txt b/contrib/libs/libevent/event_extra/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/event_extra/CMakeLists.txt
+++ b/contrib/libs/libevent/event_extra/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.darwin.txt b/contrib/libs/libevent/event_openssl/CMakeLists.darwin-x86_64.txt
index 09f088478d..09f088478d 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.linux.txt b/contrib/libs/libevent/event_openssl/CMakeLists.linux-x86_64.txt
index 12cc167e6b..12cc167e6b 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.txt b/contrib/libs/libevent/event_openssl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libevent/event_thread/CMakeLists.darwin.txt b/contrib/libs/libevent/event_thread/CMakeLists.darwin-x86_64.txt
index 0cbd83fbf4..0cbd83fbf4 100644
--- a/contrib/libs/libevent/event_thread/CMakeLists.darwin.txt
+++ b/contrib/libs/libevent/event_thread/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libevent/event_thread/CMakeLists.linux.txt b/contrib/libs/libevent/event_thread/CMakeLists.linux-x86_64.txt
index 27fc1b32f5..27fc1b32f5 100644
--- a/contrib/libs/libevent/event_thread/CMakeLists.linux.txt
+++ b/contrib/libs/libevent/event_thread/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libevent/event_thread/CMakeLists.txt b/contrib/libs/libevent/event_thread/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libevent/event_thread/CMakeLists.txt
+++ b/contrib/libs/libevent/event_thread/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libfyaml/CMakeLists.darwin.txt b/contrib/libs/libfyaml/CMakeLists.darwin-x86_64.txt
index 0dc91909d1..0dc91909d1 100644
--- a/contrib/libs/libfyaml/CMakeLists.darwin.txt
+++ b/contrib/libs/libfyaml/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libfyaml/CMakeLists.linux.txt b/contrib/libs/libfyaml/CMakeLists.linux-x86_64.txt
index f1c72fcd21..f1c72fcd21 100644
--- a/contrib/libs/libfyaml/CMakeLists.linux.txt
+++ b/contrib/libs/libfyaml/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libfyaml/CMakeLists.txt b/contrib/libs/libfyaml/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libfyaml/CMakeLists.txt
+++ b/contrib/libs/libfyaml/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libunwind/CMakeLists.darwin.txt b/contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt
index 47aedfab8f..47aedfab8f 100644
--- a/contrib/libs/libunwind/CMakeLists.darwin.txt
+++ b/contrib/libs/libunwind/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libunwind/CMakeLists.linux.txt b/contrib/libs/libunwind/CMakeLists.linux-x86_64.txt
index 80a28161e0..80a28161e0 100644
--- a/contrib/libs/libunwind/CMakeLists.linux.txt
+++ b/contrib/libs/libunwind/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libunwind/CMakeLists.txt b/contrib/libs/libunwind/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libunwind/CMakeLists.txt
+++ b/contrib/libs/libunwind/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/liburing/CMakeLists.linux.txt b/contrib/libs/liburing/CMakeLists.linux-x86_64.txt
index 63d62ff3ed..63d62ff3ed 100644
--- a/contrib/libs/liburing/CMakeLists.linux.txt
+++ b/contrib/libs/liburing/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/liburing/CMakeLists.txt b/contrib/libs/liburing/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/contrib/libs/liburing/CMakeLists.txt
+++ b/contrib/libs/liburing/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/libxml/CMakeLists.darwin.txt b/contrib/libs/libxml/CMakeLists.darwin-x86_64.txt
index d593318062..d593318062 100644
--- a/contrib/libs/libxml/CMakeLists.darwin.txt
+++ b/contrib/libs/libxml/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/libxml/CMakeLists.linux.txt b/contrib/libs/libxml/CMakeLists.linux-x86_64.txt
index b607fa620b..b607fa620b 100644
--- a/contrib/libs/libxml/CMakeLists.linux.txt
+++ b/contrib/libs/libxml/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/libxml/CMakeLists.txt b/contrib/libs/libxml/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/libxml/CMakeLists.txt
+++ b/contrib/libs/libxml/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/linux-headers/CMakeLists.linux.txt b/contrib/libs/linux-headers/CMakeLists.linux-x86_64.txt
index 550534bb10..550534bb10 100644
--- a/contrib/libs/linux-headers/CMakeLists.linux.txt
+++ b/contrib/libs/linux-headers/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/linux-headers/CMakeLists.txt b/contrib/libs/linux-headers/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/contrib/libs/linux-headers/CMakeLists.txt
+++ b/contrib/libs/linux-headers/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/linuxvdso/CMakeLists.darwin.txt b/contrib/libs/linuxvdso/CMakeLists.darwin-x86_64.txt
index a8dd8f11c1..a8dd8f11c1 100644
--- a/contrib/libs/linuxvdso/CMakeLists.darwin.txt
+++ b/contrib/libs/linuxvdso/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/linuxvdso/CMakeLists.linux.txt b/contrib/libs/linuxvdso/CMakeLists.linux-x86_64.txt
index 5d4a882319..5d4a882319 100644
--- a/contrib/libs/linuxvdso/CMakeLists.linux.txt
+++ b/contrib/libs/linuxvdso/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/linuxvdso/CMakeLists.txt b/contrib/libs/linuxvdso/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/linuxvdso/CMakeLists.txt
+++ b/contrib/libs/linuxvdso/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/linuxvdso/original/CMakeLists.linux.txt b/contrib/libs/linuxvdso/original/CMakeLists.linux-x86_64.txt
index 92603f7489..92603f7489 100644
--- a/contrib/libs/linuxvdso/original/CMakeLists.linux.txt
+++ b/contrib/libs/linuxvdso/original/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/linuxvdso/original/CMakeLists.txt b/contrib/libs/linuxvdso/original/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/contrib/libs/linuxvdso/original/CMakeLists.txt
+++ b/contrib/libs/linuxvdso/original/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/CMakeLists.darwin.txt b/contrib/libs/llvm12/CMakeLists.darwin-x86_64.txt
index 953c61faac..953c61faac 100644
--- a/contrib/libs/llvm12/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/CMakeLists.linux.txt b/contrib/libs/llvm12/CMakeLists.linux-x86_64.txt
index 21e1679e2d..21e1679e2d 100644
--- a/contrib/libs/llvm12/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/CMakeLists.txt b/contrib/libs/llvm12/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/CMakeLists.txt
+++ b/contrib/libs/llvm12/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/include/CMakeLists.darwin.txt b/contrib/libs/llvm12/include/CMakeLists.darwin-x86_64.txt
index 7ea3024199..7ea3024199 100644
--- a/contrib/libs/llvm12/include/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/include/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/include/CMakeLists.linux.txt b/contrib/libs/llvm12/include/CMakeLists.linux-x86_64.txt
index 468c652df5..468c652df5 100644
--- a/contrib/libs/llvm12/include/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/include/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/include/CMakeLists.txt b/contrib/libs/llvm12/include/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/include/CMakeLists.txt
+++ b/contrib/libs/llvm12/include/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Analysis/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Analysis/CMakeLists.darwin-x86_64.txt
index 2ba11227e1..2ba11227e1 100644
--- a/contrib/libs/llvm12/lib/Analysis/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Analysis/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Analysis/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Analysis/CMakeLists.linux-x86_64.txt
index 753119c17f..753119c17f 100644
--- a/contrib/libs/llvm12/lib/Analysis/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Analysis/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Analysis/CMakeLists.txt b/contrib/libs/llvm12/lib/Analysis/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Analysis/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Analysis/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.darwin-x86_64.txt
index 36839293f4..36839293f4 100644
--- a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.linux-x86_64.txt
index 558f82cd5d..558f82cd5d 100644
--- a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.txt b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/AsmParser/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/AsmParser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.darwin-x86_64.txt
index 96149cac1f..96149cac1f 100644
--- a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.linux-x86_64.txt
index a10c5f413a..a10c5f413a 100644
--- a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.txt b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/BinaryFormat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.darwin-x86_64.txt
index 39b2ea7c63..39b2ea7c63 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.linux-x86_64.txt
index 88a0842ef9..88a0842ef9 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.txt b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Reader/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.darwin-x86_64.txt
index 60790bac2e..60790bac2e 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.linux-x86_64.txt
index 7bab4525b2..7bab4525b2 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.txt b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Bitcode/Writer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.darwin-x86_64.txt
index 99a4a604d6..99a4a604d6 100644
--- a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.linux-x86_64.txt
index 421708b1ee..421708b1ee 100644
--- a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.txt b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Bitstream/Reader/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.darwin-x86_64.txt
index bcefc411a0..bcefc411a0 100644
--- a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.linux-x86_64.txt
index 8a9a46ad09..8a9a46ad09 100644
--- a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.txt b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/AsmPrinter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.darwin-x86_64.txt
index 8e35eefddb..8e35eefddb 100644
--- a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.linux-x86_64.txt
index ab68b24331..ab68b24331 100644
--- a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.txt b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/CodeGen/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.darwin-x86_64.txt
index 27309bf40c..27309bf40c 100644
--- a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.linux-x86_64.txt
index 356c3e6fed..356c3e6fed 100644
--- a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.txt b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/GlobalISel/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.darwin-x86_64.txt
index 4e4dec12da..4e4dec12da 100644
--- a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.linux-x86_64.txt
index a29c8b0bd7..a29c8b0bd7 100644
--- a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.txt b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/CodeGen/SelectionDAG/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.darwin-x86_64.txt
index 2d33903161..2d33903161 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.linux-x86_64.txt
index 8069320e81..8069320e81 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/CodeView/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.darwin-x86_64.txt
index 2b5a8b0bd7..2b5a8b0bd7 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.linux-x86_64.txt
index 99bb6435ef..99bb6435ef 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/DWARF/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.darwin-x86_64.txt
index 333a23b759..333a23b759 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.linux-x86_64.txt
index 0afe1e70f0..0afe1e70f0 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/MSF/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.darwin-x86_64.txt
index 499426d8b6..499426d8b6 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.linux-x86_64.txt
index e5b50385a4..e5b50385a4 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/PDB/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.darwin-x86_64.txt
index 39a3b7dec0..39a3b7dec0 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.linux-x86_64.txt
index dff4e05e8d..dff4e05e8d 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.txt b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/DebugInfo/Symbolize/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Demangle/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Demangle/CMakeLists.darwin-x86_64.txt
index 8ce23b0d3b..8ce23b0d3b 100644
--- a/contrib/libs/llvm12/lib/Demangle/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Demangle/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Demangle/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Demangle/CMakeLists.linux-x86_64.txt
index 91665dd594..91665dd594 100644
--- a/contrib/libs/llvm12/lib/Demangle/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Demangle/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Demangle/CMakeLists.txt b/contrib/libs/llvm12/lib/Demangle/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Demangle/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Demangle/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.darwin-x86_64.txt
index 8822271bb6..8822271bb6 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.linux-x86_64.txt
index 0b5d23d06f..0b5d23d06f 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.darwin-x86_64.txt
index 5404346e22..5404346e22 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.linux-x86_64.txt
index e2731cdb21..e2731cdb21 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/MCJIT/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.linux-x86_64.txt
index 99bf1810a2..99bf1810a2 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.darwin-x86_64.txt
index a55dda54ce..a55dda54ce 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.linux-x86_64.txt
index f79d0d9af0..f79d0d9af0 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin-x86_64.txt
index ff198fe772..ff198fe772 100644
--- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-x86_64.txt
index 879a65a6cb..879a65a6cb 100644
--- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/IR/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/IR/CMakeLists.darwin-x86_64.txt
index 39523b06af..39523b06af 100644
--- a/contrib/libs/llvm12/lib/IR/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/IR/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/IR/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/IR/CMakeLists.linux-x86_64.txt
index 1ec678d8d5..1ec678d8d5 100644
--- a/contrib/libs/llvm12/lib/IR/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/IR/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/IR/CMakeLists.txt b/contrib/libs/llvm12/lib/IR/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/IR/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/IR/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/IRReader/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/IRReader/CMakeLists.darwin-x86_64.txt
index bea3fbc885..bea3fbc885 100644
--- a/contrib/libs/llvm12/lib/IRReader/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/IRReader/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/IRReader/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/IRReader/CMakeLists.linux-x86_64.txt
index 2fc3d6c781..2fc3d6c781 100644
--- a/contrib/libs/llvm12/lib/IRReader/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/IRReader/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/IRReader/CMakeLists.txt b/contrib/libs/llvm12/lib/IRReader/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/IRReader/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/IRReader/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Linker/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Linker/CMakeLists.darwin-x86_64.txt
index 1b6e260057..1b6e260057 100644
--- a/contrib/libs/llvm12/lib/Linker/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Linker/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Linker/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Linker/CMakeLists.linux-x86_64.txt
index 0008227988..0008227988 100644
--- a/contrib/libs/llvm12/lib/Linker/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Linker/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Linker/CMakeLists.txt b/contrib/libs/llvm12/lib/Linker/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Linker/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Linker/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/MC/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/MC/CMakeLists.darwin-x86_64.txt
index a873c2d122..a873c2d122 100644
--- a/contrib/libs/llvm12/lib/MC/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/MC/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/MC/CMakeLists.linux-x86_64.txt
index 62a27d359d..62a27d359d 100644
--- a/contrib/libs/llvm12/lib/MC/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/MC/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/CMakeLists.txt b/contrib/libs/llvm12/lib/MC/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/MC/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/MC/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.darwin-x86_64.txt
index a2bee93bc4..a2bee93bc4 100644
--- a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.linux-x86_64.txt
index a6713624c1..a6713624c1 100644
--- a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.txt b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/MC/MCDisassembler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.darwin-x86_64.txt
index e947a4a7c4..e947a4a7c4 100644
--- a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.linux-x86_64.txt
index 5385e415dd..5385e415dd 100644
--- a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.txt b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/MC/MCParser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Object/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Object/CMakeLists.darwin-x86_64.txt
index f1207f4b5d..f1207f4b5d 100644
--- a/contrib/libs/llvm12/lib/Object/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Object/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Object/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Object/CMakeLists.linux-x86_64.txt
index 45fb57f72c..45fb57f72c 100644
--- a/contrib/libs/llvm12/lib/Object/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Object/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Object/CMakeLists.txt b/contrib/libs/llvm12/lib/Object/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Object/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Object/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.darwin-x86_64.txt
index 3e79d53db2..3e79d53db2 100644
--- a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.linux-x86_64.txt
index 8dbd3c6d65..8dbd3c6d65 100644
--- a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.txt b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/ProfileData/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/ProfileData/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Remarks/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Remarks/CMakeLists.darwin-x86_64.txt
index edd1e0fe35..edd1e0fe35 100644
--- a/contrib/libs/llvm12/lib/Remarks/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Remarks/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Remarks/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Remarks/CMakeLists.linux-x86_64.txt
index ab39010290..ab39010290 100644
--- a/contrib/libs/llvm12/lib/Remarks/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Remarks/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Remarks/CMakeLists.txt b/contrib/libs/llvm12/lib/Remarks/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Remarks/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Remarks/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.darwin-x86_64.txt
index e00be62440..e00be62440 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.linux-x86_64.txt
index 89974d62a5..89974d62a5 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/TableGen/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/TableGen/CMakeLists.darwin-x86_64.txt
index 6f2ec53956..6f2ec53956 100644
--- a/contrib/libs/llvm12/lib/TableGen/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/TableGen/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/TableGen/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/TableGen/CMakeLists.linux-x86_64.txt
index 13e6f13167..13e6f13167 100644
--- a/contrib/libs/llvm12/lib/TableGen/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/TableGen/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/TableGen/CMakeLists.txt b/contrib/libs/llvm12/lib/TableGen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/TableGen/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/TableGen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/CMakeLists.darwin-x86_64.txt
index d8ccbcb7dc..d8ccbcb7dc 100644
--- a/contrib/libs/llvm12/lib/Target/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/CMakeLists.linux-x86_64.txt
index cf814ae947..cf814ae947 100644
--- a/contrib/libs/llvm12/lib/Target/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.darwin-x86_64.txt
index 122aabfd9c..122aabfd9c 100644
--- a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.linux-x86_64.txt
index 30cd4e60a5..30cd4e60a5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/AsmParser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.darwin-x86_64.txt
index aaa8d6337d..aaa8d6337d 100644
--- a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.linux-x86_64.txt
index 982a7323e1..982a7323e1 100644
--- a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.darwin-x86_64.txt
index 9aeb4c5140..9aeb4c5140 100644
--- a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.linux-x86_64.txt
index eecb1b3d5f..eecb1b3d5f 100644
--- a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/Disassembler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.darwin-x86_64.txt
index d38e0dc78b..d38e0dc78b 100644
--- a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.linux-x86_64.txt
index 8f818b1bf0..8f818b1bf0 100644
--- a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/MCTargetDesc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.darwin-x86_64.txt
index f8e6afeb96..f8e6afeb96 100644
--- a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.linux-x86_64.txt
index 776f51f91d..776f51f91d 100644
--- a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.txt b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Target/X86/TargetInfo/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.darwin-x86_64.txt
index 507d58e59b..507d58e59b 100644
--- a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.linux-x86_64.txt
index 4914b7d4f3..4914b7d4f3 100644
--- a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.txt b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/TextAPI/MachO/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.darwin-x86_64.txt
index 5ca07fe1bc..5ca07fe1bc 100644
--- a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.linux-x86_64.txt
index b1a4c8817a..b1a4c8817a 100644
--- a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.darwin-x86_64.txt
index bdf9095525..bdf9095525 100644
--- a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.linux-x86_64.txt
index ee458414a0..ee458414a0 100644
--- a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/CFGuard/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.darwin-x86_64.txt
index a703571757..a703571757 100644
--- a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.linux-x86_64.txt
index 00fbb651b8..00fbb651b8 100644
--- a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/IPO/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.darwin-x86_64.txt
index 1d62defbb4..1d62defbb4 100644
--- a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.linux-x86_64.txt
index 870556286d..870556286d 100644
--- a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/InstCombine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.darwin-x86_64.txt
index bf742c3572..bf742c3572 100644
--- a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.linux-x86_64.txt
index 1c1b924cc4..1c1b924cc4 100644
--- a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Instrumentation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.darwin-x86_64.txt
index b69d2408d2..b69d2408d2 100644
--- a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.linux-x86_64.txt
index 17250eafec..17250eafec 100644
--- a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/ObjCARC/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.darwin-x86_64.txt
index 85fbc1b9a9..85fbc1b9a9 100644
--- a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.linux-x86_64.txt
index b8137e772b..b8137e772b 100644
--- a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Scalar/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.darwin-x86_64.txt
index 85ed4a4c6d..85ed4a4c6d 100644
--- a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.linux-x86_64.txt
index f9c59ee4c3..f9c59ee4c3 100644
--- a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Utils/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.darwin.txt b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.darwin-x86_64.txt
index d45ba449fd..d45ba449fd 100644
--- a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.linux.txt b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.linux-x86_64.txt
index b0d2491235..b0d2491235 100644
--- a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.txt b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Transforms/Vectorize/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin-x86_64.txt
index ef39d6fd6e..ef39d6fd6e 100644
--- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux-x86_64.txt
index d8d6dc0ce5..d8d6dc0ce5 100644
--- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt
+++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.darwin.txt b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.darwin-x86_64.txt
index 7ab180f92f..7ab180f92f 100644
--- a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.linux.txt b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.linux-x86_64.txt
index bb006dd12d..bb006dd12d 100644
--- a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.txt b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.txt
+++ b/contrib/libs/llvm12/utils/TableGen/GlobalISel/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/lua/CMakeLists.darwin.txt b/contrib/libs/lua/CMakeLists.darwin-x86_64.txt
index b8bb770b44..b8bb770b44 100644
--- a/contrib/libs/lua/CMakeLists.darwin.txt
+++ b/contrib/libs/lua/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/lua/CMakeLists.linux.txt b/contrib/libs/lua/CMakeLists.linux-x86_64.txt
index c9c201999b..c9c201999b 100644
--- a/contrib/libs/lua/CMakeLists.linux.txt
+++ b/contrib/libs/lua/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/lua/CMakeLists.txt b/contrib/libs/lua/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/lua/CMakeLists.txt
+++ b/contrib/libs/lua/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/lz4/CMakeLists.darwin.txt b/contrib/libs/lz4/CMakeLists.darwin-x86_64.txt
index 970c719b71..970c719b71 100644
--- a/contrib/libs/lz4/CMakeLists.darwin.txt
+++ b/contrib/libs/lz4/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/lz4/CMakeLists.linux.txt b/contrib/libs/lz4/CMakeLists.linux-x86_64.txt
index 696aaa0056..696aaa0056 100644
--- a/contrib/libs/lz4/CMakeLists.linux.txt
+++ b/contrib/libs/lz4/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/lz4/CMakeLists.txt b/contrib/libs/lz4/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/lz4/CMakeLists.txt
+++ b/contrib/libs/lz4/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/lzma/CMakeLists.darwin.txt b/contrib/libs/lzma/CMakeLists.darwin-x86_64.txt
index d525ab738b..d525ab738b 100644
--- a/contrib/libs/lzma/CMakeLists.darwin.txt
+++ b/contrib/libs/lzma/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/lzma/CMakeLists.linux.txt b/contrib/libs/lzma/CMakeLists.linux-x86_64.txt
index 1be6e4f2c7..1be6e4f2c7 100644
--- a/contrib/libs/lzma/CMakeLists.linux.txt
+++ b/contrib/libs/lzma/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/lzma/CMakeLists.txt b/contrib/libs/lzma/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/lzma/CMakeLists.txt
+++ b/contrib/libs/lzma/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/lzmasdk/CMakeLists.darwin.txt b/contrib/libs/lzmasdk/CMakeLists.darwin-x86_64.txt
index fa5ab87a58..fa5ab87a58 100644
--- a/contrib/libs/lzmasdk/CMakeLists.darwin.txt
+++ b/contrib/libs/lzmasdk/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/lzmasdk/CMakeLists.linux.txt b/contrib/libs/lzmasdk/CMakeLists.linux-x86_64.txt
index 446f28a8ed..446f28a8ed 100644
--- a/contrib/libs/lzmasdk/CMakeLists.linux.txt
+++ b/contrib/libs/lzmasdk/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/lzmasdk/CMakeLists.txt b/contrib/libs/lzmasdk/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/lzmasdk/CMakeLists.txt
+++ b/contrib/libs/lzmasdk/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/miniselect/CMakeLists.darwin.txt b/contrib/libs/miniselect/CMakeLists.darwin-x86_64.txt
index f51760c82e..f51760c82e 100644
--- a/contrib/libs/miniselect/CMakeLists.darwin.txt
+++ b/contrib/libs/miniselect/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/miniselect/CMakeLists.linux.txt b/contrib/libs/miniselect/CMakeLists.linux-x86_64.txt
index ff3e8d2dd3..ff3e8d2dd3 100644
--- a/contrib/libs/miniselect/CMakeLists.linux.txt
+++ b/contrib/libs/miniselect/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/miniselect/CMakeLists.txt b/contrib/libs/miniselect/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/miniselect/CMakeLists.txt
+++ b/contrib/libs/miniselect/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/nayuki_md5/CMakeLists.darwin.txt b/contrib/libs/nayuki_md5/CMakeLists.darwin-x86_64.txt
index aa5e1ba2a7..aa5e1ba2a7 100644
--- a/contrib/libs/nayuki_md5/CMakeLists.darwin.txt
+++ b/contrib/libs/nayuki_md5/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/nayuki_md5/CMakeLists.linux.txt b/contrib/libs/nayuki_md5/CMakeLists.linux-x86_64.txt
index 805840b5cd..805840b5cd 100644
--- a/contrib/libs/nayuki_md5/CMakeLists.linux.txt
+++ b/contrib/libs/nayuki_md5/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/nayuki_md5/CMakeLists.txt b/contrib/libs/nayuki_md5/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/nayuki_md5/CMakeLists.txt
+++ b/contrib/libs/nayuki_md5/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/nghttp2/CMakeLists.darwin.txt b/contrib/libs/nghttp2/CMakeLists.darwin-x86_64.txt
index e6d5bc3ea1..e6d5bc3ea1 100644
--- a/contrib/libs/nghttp2/CMakeLists.darwin.txt
+++ b/contrib/libs/nghttp2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/nghttp2/CMakeLists.linux.txt b/contrib/libs/nghttp2/CMakeLists.linux-x86_64.txt
index 3224ad6131..3224ad6131 100644
--- a/contrib/libs/nghttp2/CMakeLists.linux.txt
+++ b/contrib/libs/nghttp2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/nghttp2/CMakeLists.txt b/contrib/libs/nghttp2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/nghttp2/CMakeLists.txt
+++ b/contrib/libs/nghttp2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/pcre/CMakeLists.darwin.txt b/contrib/libs/pcre/CMakeLists.darwin-x86_64.txt
index d217f5c0b3..d217f5c0b3 100644
--- a/contrib/libs/pcre/CMakeLists.darwin.txt
+++ b/contrib/libs/pcre/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/pcre/CMakeLists.linux.txt b/contrib/libs/pcre/CMakeLists.linux-x86_64.txt
index 3051404f46..3051404f46 100644
--- a/contrib/libs/pcre/CMakeLists.linux.txt
+++ b/contrib/libs/pcre/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/pcre/CMakeLists.txt b/contrib/libs/pcre/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/pcre/CMakeLists.txt
+++ b/contrib/libs/pcre/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/pcre/pcre16/CMakeLists.darwin.txt b/contrib/libs/pcre/pcre16/CMakeLists.darwin-x86_64.txt
index 5f646dba67..5f646dba67 100644
--- a/contrib/libs/pcre/pcre16/CMakeLists.darwin.txt
+++ b/contrib/libs/pcre/pcre16/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/pcre/pcre16/CMakeLists.linux.txt b/contrib/libs/pcre/pcre16/CMakeLists.linux-x86_64.txt
index 22abfadba3..22abfadba3 100644
--- a/contrib/libs/pcre/pcre16/CMakeLists.linux.txt
+++ b/contrib/libs/pcre/pcre16/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/pcre/pcre16/CMakeLists.txt b/contrib/libs/pcre/pcre16/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/pcre/pcre16/CMakeLists.txt
+++ b/contrib/libs/pcre/pcre16/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/pcre/pcre32/CMakeLists.darwin.txt b/contrib/libs/pcre/pcre32/CMakeLists.darwin-x86_64.txt
index 2be6098116..2be6098116 100644
--- a/contrib/libs/pcre/pcre32/CMakeLists.darwin.txt
+++ b/contrib/libs/pcre/pcre32/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/pcre/pcre32/CMakeLists.linux.txt b/contrib/libs/pcre/pcre32/CMakeLists.linux-x86_64.txt
index f8269b2859..f8269b2859 100644
--- a/contrib/libs/pcre/pcre32/CMakeLists.linux.txt
+++ b/contrib/libs/pcre/pcre32/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/pcre/pcre32/CMakeLists.txt b/contrib/libs/pcre/pcre32/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/pcre/pcre32/CMakeLists.txt
+++ b/contrib/libs/pcre/pcre32/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/pdqsort/CMakeLists.darwin.txt b/contrib/libs/pdqsort/CMakeLists.darwin-x86_64.txt
index 7041694f05..7041694f05 100644
--- a/contrib/libs/pdqsort/CMakeLists.darwin.txt
+++ b/contrib/libs/pdqsort/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/pdqsort/CMakeLists.linux.txt b/contrib/libs/pdqsort/CMakeLists.linux-x86_64.txt
index 9824fa0017..9824fa0017 100644
--- a/contrib/libs/pdqsort/CMakeLists.linux.txt
+++ b/contrib/libs/pdqsort/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/pdqsort/CMakeLists.txt b/contrib/libs/pdqsort/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/pdqsort/CMakeLists.txt
+++ b/contrib/libs/pdqsort/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/Crypto/CMakeLists.darwin.txt b/contrib/libs/poco/Crypto/CMakeLists.darwin-x86_64.txt
index 431de24a13..431de24a13 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/Crypto/CMakeLists.linux.txt b/contrib/libs/poco/Crypto/CMakeLists.linux-x86_64.txt
index 0638e0d219..0638e0d219 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.linux.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/Crypto/CMakeLists.txt b/contrib/libs/poco/Crypto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/Foundation/CMakeLists.darwin.txt b/contrib/libs/poco/Foundation/CMakeLists.darwin-x86_64.txt
index 8b1e0a65b5..8b1e0a65b5 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/Foundation/CMakeLists.linux.txt b/contrib/libs/poco/Foundation/CMakeLists.linux-x86_64.txt
index 781a72b811..781a72b811 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.linux.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/Foundation/CMakeLists.txt b/contrib/libs/poco/Foundation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/JSON/CMakeLists.darwin.txt b/contrib/libs/poco/JSON/CMakeLists.darwin-x86_64.txt
index 403b3bc5c6..403b3bc5c6 100644
--- a/contrib/libs/poco/JSON/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/JSON/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/JSON/CMakeLists.linux.txt b/contrib/libs/poco/JSON/CMakeLists.linux-x86_64.txt
index 03b67f2fd7..03b67f2fd7 100644
--- a/contrib/libs/poco/JSON/CMakeLists.linux.txt
+++ b/contrib/libs/poco/JSON/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/JSON/CMakeLists.txt b/contrib/libs/poco/JSON/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/JSON/CMakeLists.txt
+++ b/contrib/libs/poco/JSON/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/Net/CMakeLists.darwin.txt b/contrib/libs/poco/Net/CMakeLists.darwin-x86_64.txt
index 4dd5878c21..4dd5878c21 100644
--- a/contrib/libs/poco/Net/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/Net/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/Net/CMakeLists.linux.txt b/contrib/libs/poco/Net/CMakeLists.linux-x86_64.txt
index cf62029e71..cf62029e71 100644
--- a/contrib/libs/poco/Net/CMakeLists.linux.txt
+++ b/contrib/libs/poco/Net/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/Net/CMakeLists.txt b/contrib/libs/poco/Net/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/Net/CMakeLists.txt
+++ b/contrib/libs/poco/Net/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.darwin.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.darwin-x86_64.txt
index 4d7e2f17c0..4d7e2f17c0 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.linux.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.linux-x86_64.txt
index 7eab9ec512..7eab9ec512 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.linux.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/Util/CMakeLists.darwin.txt b/contrib/libs/poco/Util/CMakeLists.darwin-x86_64.txt
index 813912d18d..813912d18d 100644
--- a/contrib/libs/poco/Util/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/Util/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/Util/CMakeLists.linux.txt b/contrib/libs/poco/Util/CMakeLists.linux-x86_64.txt
index 56c49ac4c6..56c49ac4c6 100644
--- a/contrib/libs/poco/Util/CMakeLists.linux.txt
+++ b/contrib/libs/poco/Util/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/Util/CMakeLists.txt b/contrib/libs/poco/Util/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/Util/CMakeLists.txt
+++ b/contrib/libs/poco/Util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/poco/XML/CMakeLists.darwin.txt b/contrib/libs/poco/XML/CMakeLists.darwin-x86_64.txt
index 5e02faf42f..5e02faf42f 100644
--- a/contrib/libs/poco/XML/CMakeLists.darwin.txt
+++ b/contrib/libs/poco/XML/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/poco/XML/CMakeLists.linux.txt b/contrib/libs/poco/XML/CMakeLists.linux-x86_64.txt
index 803edf0122..803edf0122 100644
--- a/contrib/libs/poco/XML/CMakeLists.linux.txt
+++ b/contrib/libs/poco/XML/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/poco/XML/CMakeLists.txt b/contrib/libs/poco/XML/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/poco/XML/CMakeLists.txt
+++ b/contrib/libs/poco/XML/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/protobuf/CMakeLists.darwin.txt b/contrib/libs/protobuf/CMakeLists.darwin-x86_64.txt
index 940e5e3a99..940e5e3a99 100644
--- a/contrib/libs/protobuf/CMakeLists.darwin.txt
+++ b/contrib/libs/protobuf/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/protobuf/CMakeLists.linux.txt b/contrib/libs/protobuf/CMakeLists.linux-x86_64.txt
index af2c6d8404..af2c6d8404 100644
--- a/contrib/libs/protobuf/CMakeLists.linux.txt
+++ b/contrib/libs/protobuf/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/protobuf/CMakeLists.txt b/contrib/libs/protobuf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/protobuf/CMakeLists.txt
+++ b/contrib/libs/protobuf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/protoc/CMakeLists.darwin.txt b/contrib/libs/protoc/CMakeLists.darwin-x86_64.txt
index 4cce10e7b9..4cce10e7b9 100644
--- a/contrib/libs/protoc/CMakeLists.darwin.txt
+++ b/contrib/libs/protoc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/protoc/CMakeLists.linux.txt b/contrib/libs/protoc/CMakeLists.linux-x86_64.txt
index b6a3dcc4bc..b6a3dcc4bc 100644
--- a/contrib/libs/protoc/CMakeLists.linux.txt
+++ b/contrib/libs/protoc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/protoc/CMakeLists.txt b/contrib/libs/protoc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/protoc/CMakeLists.txt
+++ b/contrib/libs/protoc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/rapidjson/CMakeLists.darwin.txt b/contrib/libs/rapidjson/CMakeLists.darwin-x86_64.txt
index eb8dce44f8..eb8dce44f8 100644
--- a/contrib/libs/rapidjson/CMakeLists.darwin.txt
+++ b/contrib/libs/rapidjson/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/rapidjson/CMakeLists.linux.txt b/contrib/libs/rapidjson/CMakeLists.linux-x86_64.txt
index a6f2faf478..a6f2faf478 100644
--- a/contrib/libs/rapidjson/CMakeLists.linux.txt
+++ b/contrib/libs/rapidjson/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/rapidjson/CMakeLists.txt b/contrib/libs/rapidjson/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/rapidjson/CMakeLists.txt
+++ b/contrib/libs/rapidjson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/re2/CMakeLists.darwin.txt b/contrib/libs/re2/CMakeLists.darwin-x86_64.txt
index 0c93126cd1..0c93126cd1 100644
--- a/contrib/libs/re2/CMakeLists.darwin.txt
+++ b/contrib/libs/re2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/re2/CMakeLists.linux.txt b/contrib/libs/re2/CMakeLists.linux-x86_64.txt
index ed757c6e17..ed757c6e17 100644
--- a/contrib/libs/re2/CMakeLists.linux.txt
+++ b/contrib/libs/re2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/re2/CMakeLists.txt b/contrib/libs/re2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/re2/CMakeLists.txt
+++ b/contrib/libs/re2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/snappy/CMakeLists.darwin.txt b/contrib/libs/snappy/CMakeLists.darwin-x86_64.txt
index 5e20f5ea3d..5e20f5ea3d 100644
--- a/contrib/libs/snappy/CMakeLists.darwin.txt
+++ b/contrib/libs/snappy/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/snappy/CMakeLists.linux.txt b/contrib/libs/snappy/CMakeLists.linux-x86_64.txt
index 732c5e5474..732c5e5474 100644
--- a/contrib/libs/snappy/CMakeLists.linux.txt
+++ b/contrib/libs/snappy/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/snappy/CMakeLists.txt b/contrib/libs/snappy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/snappy/CMakeLists.txt
+++ b/contrib/libs/snappy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/sparsehash/CMakeLists.darwin.txt b/contrib/libs/sparsehash/CMakeLists.darwin-x86_64.txt
index 0de0e50d71..0de0e50d71 100644
--- a/contrib/libs/sparsehash/CMakeLists.darwin.txt
+++ b/contrib/libs/sparsehash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/sparsehash/CMakeLists.linux.txt b/contrib/libs/sparsehash/CMakeLists.linux-x86_64.txt
index ddcaf918dc..ddcaf918dc 100644
--- a/contrib/libs/sparsehash/CMakeLists.linux.txt
+++ b/contrib/libs/sparsehash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/sparsehash/CMakeLists.txt b/contrib/libs/sparsehash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/sparsehash/CMakeLists.txt
+++ b/contrib/libs/sparsehash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/t1ha/CMakeLists.darwin.txt b/contrib/libs/t1ha/CMakeLists.darwin-x86_64.txt
index cf6ef99511..cf6ef99511 100644
--- a/contrib/libs/t1ha/CMakeLists.darwin.txt
+++ b/contrib/libs/t1ha/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/t1ha/CMakeLists.linux.txt b/contrib/libs/t1ha/CMakeLists.linux-x86_64.txt
index 7f2893caa3..7f2893caa3 100644
--- a/contrib/libs/t1ha/CMakeLists.linux.txt
+++ b/contrib/libs/t1ha/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/t1ha/CMakeLists.txt b/contrib/libs/t1ha/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/t1ha/CMakeLists.txt
+++ b/contrib/libs/t1ha/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/tbb/CMakeLists.darwin.txt b/contrib/libs/tbb/CMakeLists.darwin-x86_64.txt
index a34e19b4a0..a34e19b4a0 100644
--- a/contrib/libs/tbb/CMakeLists.darwin.txt
+++ b/contrib/libs/tbb/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/tbb/CMakeLists.linux.txt b/contrib/libs/tbb/CMakeLists.linux-x86_64.txt
index 4e7404a3da..4e7404a3da 100644
--- a/contrib/libs/tbb/CMakeLists.linux.txt
+++ b/contrib/libs/tbb/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/tbb/CMakeLists.txt b/contrib/libs/tbb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/tbb/CMakeLists.txt
+++ b/contrib/libs/tbb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/tcmalloc/CMakeLists.darwin.txt b/contrib/libs/tcmalloc/CMakeLists.darwin-x86_64.txt
index daf0950e7c..daf0950e7c 100644
--- a/contrib/libs/tcmalloc/CMakeLists.darwin.txt
+++ b/contrib/libs/tcmalloc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/tcmalloc/CMakeLists.linux.txt b/contrib/libs/tcmalloc/CMakeLists.linux-x86_64.txt
index 53fb70fafa..53fb70fafa 100644
--- a/contrib/libs/tcmalloc/CMakeLists.linux.txt
+++ b/contrib/libs/tcmalloc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/tcmalloc/CMakeLists.txt b/contrib/libs/tcmalloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/tcmalloc/CMakeLists.txt
+++ b/contrib/libs/tcmalloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.darwin.txt b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.darwin-x86_64.txt
index ff72551b97..ff72551b97 100644
--- a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.darwin.txt
+++ b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.linux.txt b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.linux-x86_64.txt
index 4fc12f623d..4fc12f623d 100644
--- a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.linux.txt
+++ b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.txt b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/tcmalloc/malloc_extension/CMakeLists.txt
+++ b/contrib/libs/tcmalloc/malloc_extension/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.linux.txt b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.linux-x86_64.txt
index 7a19810cba..7a19810cba 100644
--- a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.linux.txt
+++ b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
index 200be30d20..9e182254db 100644
--- a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
+++ b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt
@@ -7,5 +7,5 @@
 
 
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/utf8proc/CMakeLists.darwin.txt b/contrib/libs/utf8proc/CMakeLists.darwin-x86_64.txt
index da6056a44b..da6056a44b 100644
--- a/contrib/libs/utf8proc/CMakeLists.darwin.txt
+++ b/contrib/libs/utf8proc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/utf8proc/CMakeLists.linux.txt b/contrib/libs/utf8proc/CMakeLists.linux-x86_64.txt
index 321e8eac3f..321e8eac3f 100644
--- a/contrib/libs/utf8proc/CMakeLists.linux.txt
+++ b/contrib/libs/utf8proc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/utf8proc/CMakeLists.txt b/contrib/libs/utf8proc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/utf8proc/CMakeLists.txt
+++ b/contrib/libs/utf8proc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/xxhash/CMakeLists.darwin.txt b/contrib/libs/xxhash/CMakeLists.darwin-x86_64.txt
index 2afaa79b4e..2afaa79b4e 100644
--- a/contrib/libs/xxhash/CMakeLists.darwin.txt
+++ b/contrib/libs/xxhash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/xxhash/CMakeLists.linux.txt b/contrib/libs/xxhash/CMakeLists.linux-x86_64.txt
index 0bc17080e1..0bc17080e1 100644
--- a/contrib/libs/xxhash/CMakeLists.linux.txt
+++ b/contrib/libs/xxhash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/xxhash/CMakeLists.txt b/contrib/libs/xxhash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/xxhash/CMakeLists.txt
+++ b/contrib/libs/xxhash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/yaml-cpp/CMakeLists.darwin.txt b/contrib/libs/yaml-cpp/CMakeLists.darwin-x86_64.txt
index e5b20eefab..e5b20eefab 100644
--- a/contrib/libs/yaml-cpp/CMakeLists.darwin.txt
+++ b/contrib/libs/yaml-cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/yaml-cpp/CMakeLists.linux.txt b/contrib/libs/yaml-cpp/CMakeLists.linux-x86_64.txt
index 4daaa9883a..4daaa9883a 100644
--- a/contrib/libs/yaml-cpp/CMakeLists.linux.txt
+++ b/contrib/libs/yaml-cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/yaml-cpp/CMakeLists.txt b/contrib/libs/yaml-cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/yaml-cpp/CMakeLists.txt
+++ b/contrib/libs/yaml-cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/zstd/CMakeLists.darwin.txt b/contrib/libs/zstd/CMakeLists.darwin-x86_64.txt
index f88c0aa5f3..f88c0aa5f3 100644
--- a/contrib/libs/zstd/CMakeLists.darwin.txt
+++ b/contrib/libs/zstd/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/zstd/CMakeLists.linux.txt b/contrib/libs/zstd/CMakeLists.linux-x86_64.txt
index 1945bc36fe..1945bc36fe 100644
--- a/contrib/libs/zstd/CMakeLists.linux.txt
+++ b/contrib/libs/zstd/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/zstd/CMakeLists.txt b/contrib/libs/zstd/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/zstd/CMakeLists.txt
+++ b/contrib/libs/zstd/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/libs/zstd06/CMakeLists.darwin.txt b/contrib/libs/zstd06/CMakeLists.darwin-x86_64.txt
index b20e4ae1f5..b20e4ae1f5 100644
--- a/contrib/libs/zstd06/CMakeLists.darwin.txt
+++ b/contrib/libs/zstd06/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/libs/zstd06/CMakeLists.linux.txt b/contrib/libs/zstd06/CMakeLists.linux-x86_64.txt
index 2934739ddc..2934739ddc 100644
--- a/contrib/libs/zstd06/CMakeLists.linux.txt
+++ b/contrib/libs/zstd06/CMakeLists.linux-x86_64.txt
diff --git a/contrib/libs/zstd06/CMakeLists.txt b/contrib/libs/zstd06/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/libs/zstd06/CMakeLists.txt
+++ b/contrib/libs/zstd06/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin-x86_64.txt
index a85dbb45d3..a85dbb45d3 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux-x86_64.txt
index a51d5c8880..a51d5c8880 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin-x86_64.txt
index 76a5810817..76a5810817 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux-x86_64.txt
index 22f298cf7d..22f298cf7d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin-x86_64.txt
index 3efe12ff58..3efe12ff58 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux-x86_64.txt
index 55ca1c759b..55ca1c759b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin-x86_64.txt
index 65d79f1a81..65d79f1a81 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux-x86_64.txt
index adde78aabe..adde78aabe 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin-x86_64.txt
index a1f6d47793..a1f6d47793 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux-x86_64.txt
index e7af2024c1..e7af2024c1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin-x86_64.txt
index 0650809a3b..0650809a3b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux-x86_64.txt
index f55013927e..f55013927e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin-x86_64.txt
index 8bb73fa532..8bb73fa532 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux-x86_64.txt
index a632a01f09..a632a01f09 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin-x86_64.txt
index 1fa7e9da7f..1fa7e9da7f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux-x86_64.txt
index bb6a283f3b..bb6a283f3b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin-x86_64.txt
index f98e8828e7..f98e8828e7 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux-x86_64.txt
index 451fce6d4a..451fce6d4a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin-x86_64.txt
index ec53f57bc1..ec53f57bc1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux-x86_64.txt
index a1ceaf2b75..a1ceaf2b75 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin-x86_64.txt
index 068982719c..068982719c 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux-x86_64.txt
index 737ba55d85..737ba55d85 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin-x86_64.txt
index 564e9bb142..564e9bb142 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux-x86_64.txt
index 51892581b3..51892581b3 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin-x86_64.txt
index 18d72c6685..18d72c6685 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux-x86_64.txt
index 43faced540..43faced540 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin-x86_64.txt
index 7901d8cf24..7901d8cf24 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux-x86_64.txt
index f2e0472a5d..f2e0472a5d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin-x86_64.txt
index e46d70dd3e..e46d70dd3e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux-x86_64.txt
index 3837b42396..3837b42396 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin-x86_64.txt
index dc048c9436..dc048c9436 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux-x86_64.txt
index cdf38f454c..cdf38f454c 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin-x86_64.txt
index a5ff3f433a..a5ff3f433a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux-x86_64.txt
index 653bb04f7a..653bb04f7a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/CMakeLists.darwin-x86_64.txt
index 74ef613f08..74ef613f08 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/CMakeLists.linux-x86_64.txt
index 07f9f59ee4..07f9f59ee4 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/CMakeLists.txt b/contrib/restricted/abseil-cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin-x86_64.txt
index 535abc7c56..535abc7c56 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux-x86_64.txt
index e29a80e43d..e29a80e43d 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin-x86_64.txt
index 1c3e1d4deb..1c3e1d4deb 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux-x86_64.txt
index 89d5fdbf42..89d5fdbf42 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin-x86_64.txt
index 3be1fa1692..3be1fa1692 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux-x86_64.txt
index bf4cf39aa9..bf4cf39aa9 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin-x86_64.txt
index 3c60c7b056..3c60c7b056 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux-x86_64.txt
index 89a07a760b..89a07a760b 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin-x86_64.txt
index 51a0971139..51a0971139 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux-x86_64.txt
index a61094881a..a61094881a 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin-x86_64.txt
index e73fa82ef7..e73fa82ef7 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux-x86_64.txt
index fb49dbcfee..fb49dbcfee 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin-x86_64.txt
index bb7bb34def..bb7bb34def 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux-x86_64.txt
index 54f9fbec1c..54f9fbec1c 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin-x86_64.txt
index c2793a97ea..c2793a97ea 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux-x86_64.txt
index a7743e41a0..a7743e41a0 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin-x86_64.txt
index 3235ac4ba5..3235ac4ba5 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux-x86_64.txt
index e87b112e2f..e87b112e2f 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin-x86_64.txt
index cba7d55611..cba7d55611 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux-x86_64.txt
index 1bb7f8ea3e..1bb7f8ea3e 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin-x86_64.txt
index 82fe8b2770..82fe8b2770 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux-x86_64.txt
index a6593d4b95..a6593d4b95 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin-x86_64.txt
index 15c4b76f67..15c4b76f67 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux-x86_64.txt
index 876a1ced58..876a1ced58 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin-x86_64.txt
index 324203b94a..324203b94a 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux-x86_64.txt
index b630e36b39..b630e36b39 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin-x86_64.txt
index 82c6e43c91..82c6e43c91 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux-x86_64.txt
index ef805d8dde..ef805d8dde 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin-x86_64.txt
index e3aa400b95..e3aa400b95 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux-x86_64.txt
index 2da01ab774..2da01ab774 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin-x86_64.txt
index 16ea7b2596..16ea7b2596 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux-x86_64.txt
index 358da661fc..358da661fc 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin-x86_64.txt
index af147aa171..af147aa171 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux-x86_64.txt
index e934d9a1f3..e934d9a1f3 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin-x86_64.txt
index 9c24497045..9c24497045 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux-x86_64.txt
index cbc8bf8b2e..cbc8bf8b2e 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin-x86_64.txt
index a2f021177a..a2f021177a 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux-x86_64.txt
index 9f8f6c068d..9f8f6c068d 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin-x86_64.txt
index c28381a676..c28381a676 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.linux-x86_64.txt
index d729ec396a..d729ec396a 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin-x86_64.txt
index c6d3f58fef..c6d3f58fef 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.linux-x86_64.txt
index 2e36a7692b..2e36a7692b 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin-x86_64.txt
index d7f9cd17a6..d7f9cd17a6 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux-x86_64.txt
index e754eefb5a..e754eefb5a 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
index 64d2a9dee3..64d2a9dee3 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
index 859d5769a1..859d5769a1 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-checksums/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.darwin-x86_64.txt
index c7805ff1e2..c7805ff1e2 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-checksums/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-checksums/CMakeLists.linux.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.linux-x86_64.txt
index 70c75162ac..70c75162ac 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-checksums/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-checksums/CMakeLists.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-checksums/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt b/contrib/restricted/aws/s2n/CMakeLists.darwin-x86_64.txt
index 976996467f..976996467f 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/s2n/CMakeLists.linux.txt b/contrib/restricted/aws/s2n/CMakeLists.linux-x86_64.txt
index e4b895391c..e4b895391c 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/s2n/CMakeLists.txt b/contrib/restricted/aws/s2n/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/CMakeLists.darwin.txt b/contrib/restricted/boost/CMakeLists.darwin-x86_64.txt
index 2ce12f636b..2ce12f636b 100644
--- a/contrib/restricted/boost/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/CMakeLists.linux.txt b/contrib/restricted/boost/CMakeLists.linux-x86_64.txt
index 2ce12f636b..2ce12f636b 100644
--- a/contrib/restricted/boost/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/CMakeLists.txt b/contrib/restricted/boost/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/CMakeLists.txt
+++ b/contrib/restricted/boost/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.darwin.txt b/contrib/restricted/boost/algorithm/CMakeLists.darwin-x86_64.txt
index 7601e49d0f..7601e49d0f 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.linux.txt b/contrib/restricted/boost/algorithm/CMakeLists.linux-x86_64.txt
index ded7dbfbd8..ded7dbfbd8 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.txt b/contrib/restricted/boost/algorithm/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/align/CMakeLists.darwin.txt b/contrib/restricted/boost/align/CMakeLists.darwin-x86_64.txt
index b4f255a0c6..b4f255a0c6 100644
--- a/contrib/restricted/boost/align/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/align/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/align/CMakeLists.linux.txt b/contrib/restricted/boost/align/CMakeLists.linux-x86_64.txt
index e032aaa404..e032aaa404 100644
--- a/contrib/restricted/boost/align/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/align/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/align/CMakeLists.txt b/contrib/restricted/boost/align/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/align/CMakeLists.txt
+++ b/contrib/restricted/boost/align/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/any/CMakeLists.darwin.txt b/contrib/restricted/boost/any/CMakeLists.darwin-x86_64.txt
index 946a109665..946a109665 100644
--- a/contrib/restricted/boost/any/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/any/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/any/CMakeLists.linux.txt b/contrib/restricted/boost/any/CMakeLists.linux-x86_64.txt
index b1d4845050..b1d4845050 100644
--- a/contrib/restricted/boost/any/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/any/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/any/CMakeLists.txt b/contrib/restricted/boost/any/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/any/CMakeLists.txt
+++ b/contrib/restricted/boost/any/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/array/CMakeLists.darwin.txt b/contrib/restricted/boost/array/CMakeLists.darwin-x86_64.txt
index f640cbf516..f640cbf516 100644
--- a/contrib/restricted/boost/array/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/array/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/array/CMakeLists.linux.txt b/contrib/restricted/boost/array/CMakeLists.linux-x86_64.txt
index 157f171696..157f171696 100644
--- a/contrib/restricted/boost/array/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/array/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/array/CMakeLists.txt b/contrib/restricted/boost/array/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/array/CMakeLists.txt
+++ b/contrib/restricted/boost/array/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/asio/CMakeLists.darwin.txt b/contrib/restricted/boost/asio/CMakeLists.darwin-x86_64.txt
index 74b17e3e1b..74b17e3e1b 100644
--- a/contrib/restricted/boost/asio/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/asio/CMakeLists.linux.txt b/contrib/restricted/boost/asio/CMakeLists.linux-x86_64.txt
index 0108378f15..0108378f15 100644
--- a/contrib/restricted/boost/asio/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/asio/CMakeLists.txt b/contrib/restricted/boost/asio/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/asio/CMakeLists.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/assert/CMakeLists.darwin.txt b/contrib/restricted/boost/assert/CMakeLists.darwin-x86_64.txt
index 0ba173db4f..0ba173db4f 100644
--- a/contrib/restricted/boost/assert/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/assert/CMakeLists.linux.txt b/contrib/restricted/boost/assert/CMakeLists.linux-x86_64.txt
index bd55d5ef61..bd55d5ef61 100644
--- a/contrib/restricted/boost/assert/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/assert/CMakeLists.txt b/contrib/restricted/boost/assert/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/assert/CMakeLists.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/atomic/CMakeLists.darwin.txt b/contrib/restricted/boost/atomic/CMakeLists.darwin-x86_64.txt
index c7c24c5a0f..c7c24c5a0f 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/atomic/CMakeLists.linux.txt b/contrib/restricted/boost/atomic/CMakeLists.linux-x86_64.txt
index 5f830a8cfa..5f830a8cfa 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/atomic/CMakeLists.txt b/contrib/restricted/boost/atomic/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt
index c44e09b7d6..c44e09b7d6 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/bimap/CMakeLists.linux.txt b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt
index ec170e9cbc..ec170e9cbc 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/bimap/CMakeLists.txt b/contrib/restricted/boost/bimap/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/bind/CMakeLists.darwin.txt b/contrib/restricted/boost/bind/CMakeLists.darwin-x86_64.txt
index 88c5f9bf7b..88c5f9bf7b 100644
--- a/contrib/restricted/boost/bind/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/bind/CMakeLists.linux.txt b/contrib/restricted/boost/bind/CMakeLists.linux-x86_64.txt
index d77d1b474b..d77d1b474b 100644
--- a/contrib/restricted/boost/bind/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/bind/CMakeLists.txt b/contrib/restricted/boost/bind/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/bind/CMakeLists.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/chrono/CMakeLists.darwin.txt b/contrib/restricted/boost/chrono/CMakeLists.darwin-x86_64.txt
index af74091cab..af74091cab 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/chrono/CMakeLists.linux.txt b/contrib/restricted/boost/chrono/CMakeLists.linux-x86_64.txt
index 849cd7c215..849cd7c215 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/chrono/CMakeLists.txt b/contrib/restricted/boost/chrono/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt b/contrib/restricted/boost/concept_check/CMakeLists.darwin-x86_64.txt
index 4bea4830c4..4bea4830c4 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt b/contrib/restricted/boost/concept_check/CMakeLists.linux-x86_64.txt
index e2b6d7b868..e2b6d7b868 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.txt b/contrib/restricted/boost/concept_check/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/config/CMakeLists.darwin.txt b/contrib/restricted/boost/config/CMakeLists.darwin-x86_64.txt
index b3623a130d..b3623a130d 100644
--- a/contrib/restricted/boost/config/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/config/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/config/CMakeLists.linux.txt b/contrib/restricted/boost/config/CMakeLists.linux-x86_64.txt
index 5bebf20e98..5bebf20e98 100644
--- a/contrib/restricted/boost/config/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/config/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/config/CMakeLists.txt b/contrib/restricted/boost/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/config/CMakeLists.txt
+++ b/contrib/restricted/boost/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/container/CMakeLists.darwin.txt b/contrib/restricted/boost/container/CMakeLists.darwin-x86_64.txt
index 74ef11ce7c..74ef11ce7c 100644
--- a/contrib/restricted/boost/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/container/CMakeLists.linux.txt b/contrib/restricted/boost/container/CMakeLists.linux-x86_64.txt
index 8478a2b475..8478a2b475 100644
--- a/contrib/restricted/boost/container/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/container/CMakeLists.txt b/contrib/restricted/boost/container/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/container/CMakeLists.txt
+++ b/contrib/restricted/boost/container/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.darwin.txt b/contrib/restricted/boost/container_hash/CMakeLists.darwin-x86_64.txt
index f6ba33a6e9..f6ba33a6e9 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.linux.txt b/contrib/restricted/boost/container_hash/CMakeLists.linux-x86_64.txt
index 0e9a7fc390..0e9a7fc390 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.txt b/contrib/restricted/boost/container_hash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin-x86_64.txt
index d5301afd15..d5301afd15 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux-x86_64.txt
index 21ce313ed9..21ce313ed9 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin-x86_64.txt
index 100cd01a5d..100cd01a5d 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-x86_64.txt
index 06f9049883..06f9049883 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/conversion/CMakeLists.darwin.txt b/contrib/restricted/boost/conversion/CMakeLists.darwin-x86_64.txt
index f1a53fd123..f1a53fd123 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/conversion/CMakeLists.linux.txt b/contrib/restricted/boost/conversion/CMakeLists.linux-x86_64.txt
index ccc6337d05..ccc6337d05 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/conversion/CMakeLists.txt b/contrib/restricted/boost/conversion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/core/CMakeLists.darwin.txt b/contrib/restricted/boost/core/CMakeLists.darwin-x86_64.txt
index 8b4b0f15da..8b4b0f15da 100644
--- a/contrib/restricted/boost/core/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/core/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/core/CMakeLists.linux.txt b/contrib/restricted/boost/core/CMakeLists.linux-x86_64.txt
index 9a1bc62706..9a1bc62706 100644
--- a/contrib/restricted/boost/core/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/core/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/core/CMakeLists.txt b/contrib/restricted/boost/core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/core/CMakeLists.txt
+++ b/contrib/restricted/boost/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt b/contrib/restricted/boost/coroutine/CMakeLists.darwin-x86_64.txt
index 078b319b34..078b319b34 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt b/contrib/restricted/boost/coroutine/CMakeLists.linux-x86_64.txt
index d91726a632..d91726a632 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.txt b/contrib/restricted/boost/coroutine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/crc/CMakeLists.darwin.txt b/contrib/restricted/boost/crc/CMakeLists.darwin-x86_64.txt
index 2730ce7c01..2730ce7c01 100644
--- a/contrib/restricted/boost/crc/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/crc/CMakeLists.linux.txt b/contrib/restricted/boost/crc/CMakeLists.linux-x86_64.txt
index 6473832eb1..6473832eb1 100644
--- a/contrib/restricted/boost/crc/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/crc/CMakeLists.txt b/contrib/restricted/boost/crc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/crc/CMakeLists.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt b/contrib/restricted/boost/date_time/CMakeLists.darwin-x86_64.txt
index da90148a57..da90148a57 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/date_time/CMakeLists.linux.txt b/contrib/restricted/boost/date_time/CMakeLists.linux-x86_64.txt
index 94835f076a..94835f076a 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/date_time/CMakeLists.txt b/contrib/restricted/boost/date_time/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/describe/CMakeLists.darwin.txt b/contrib/restricted/boost/describe/CMakeLists.darwin-x86_64.txt
index baad9670e4..baad9670e4 100644
--- a/contrib/restricted/boost/describe/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/describe/CMakeLists.linux.txt b/contrib/restricted/boost/describe/CMakeLists.linux-x86_64.txt
index 4cffd37833..4cffd37833 100644
--- a/contrib/restricted/boost/describe/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/describe/CMakeLists.txt b/contrib/restricted/boost/describe/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/describe/CMakeLists.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/detail/CMakeLists.darwin.txt b/contrib/restricted/boost/detail/CMakeLists.darwin-x86_64.txt
index 4100f97935..4100f97935 100644
--- a/contrib/restricted/boost/detail/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/detail/CMakeLists.linux.txt b/contrib/restricted/boost/detail/CMakeLists.linux-x86_64.txt
index a57ff44274..a57ff44274 100644
--- a/contrib/restricted/boost/detail/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/detail/CMakeLists.txt b/contrib/restricted/boost/detail/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/detail/CMakeLists.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin-x86_64.txt
index 8854d288e8..8854d288e8 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux-x86_64.txt
index 1a02ca2150..1a02ca2150 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/endian/CMakeLists.darwin.txt b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt
index ddf28f75fe..ddf28f75fe 100644
--- a/contrib/restricted/boost/endian/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/endian/CMakeLists.linux.txt b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt
index 8a7f037fd7..8a7f037fd7 100644
--- a/contrib/restricted/boost/endian/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/endian/CMakeLists.txt b/contrib/restricted/boost/endian/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/endian/CMakeLists.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/exception/CMakeLists.darwin.txt b/contrib/restricted/boost/exception/CMakeLists.darwin-x86_64.txt
index bd4347f03d..bd4347f03d 100644
--- a/contrib/restricted/boost/exception/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/exception/CMakeLists.linux.txt b/contrib/restricted/boost/exception/CMakeLists.linux-x86_64.txt
index b818e6d085..b818e6d085 100644
--- a/contrib/restricted/boost/exception/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/exception/CMakeLists.txt b/contrib/restricted/boost/exception/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/exception/CMakeLists.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/foreach/CMakeLists.darwin.txt b/contrib/restricted/boost/foreach/CMakeLists.darwin-x86_64.txt
index d2e31c32fc..d2e31c32fc 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/foreach/CMakeLists.linux.txt b/contrib/restricted/boost/foreach/CMakeLists.linux-x86_64.txt
index f1173b51a9..f1173b51a9 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/foreach/CMakeLists.txt b/contrib/restricted/boost/foreach/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/format/CMakeLists.darwin.txt b/contrib/restricted/boost/format/CMakeLists.darwin-x86_64.txt
index 270e92cb48..270e92cb48 100644
--- a/contrib/restricted/boost/format/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/format/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/format/CMakeLists.linux.txt b/contrib/restricted/boost/format/CMakeLists.linux-x86_64.txt
index d19c8b9a86..d19c8b9a86 100644
--- a/contrib/restricted/boost/format/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/format/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/format/CMakeLists.txt b/contrib/restricted/boost/format/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/format/CMakeLists.txt
+++ b/contrib/restricted/boost/format/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/function/CMakeLists.darwin.txt b/contrib/restricted/boost/function/CMakeLists.darwin-x86_64.txt
index 5eed0832c4..5eed0832c4 100644
--- a/contrib/restricted/boost/function/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/function/CMakeLists.linux.txt b/contrib/restricted/boost/function/CMakeLists.linux-x86_64.txt
index a963bc1c02..a963bc1c02 100644
--- a/contrib/restricted/boost/function/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/function/CMakeLists.txt b/contrib/restricted/boost/function/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/function/CMakeLists.txt
+++ b/contrib/restricted/boost/function/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/function_types/CMakeLists.darwin.txt b/contrib/restricted/boost/function_types/CMakeLists.darwin-x86_64.txt
index 2c618a189f..2c618a189f 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/function_types/CMakeLists.linux.txt b/contrib/restricted/boost/function_types/CMakeLists.linux-x86_64.txt
index e128b6adff..e128b6adff 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/function_types/CMakeLists.txt b/contrib/restricted/boost/function_types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/functional/CMakeLists.darwin.txt b/contrib/restricted/boost/functional/CMakeLists.darwin-x86_64.txt
index 239823acab..239823acab 100644
--- a/contrib/restricted/boost/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/functional/CMakeLists.linux.txt b/contrib/restricted/boost/functional/CMakeLists.linux-x86_64.txt
index baa561be6c..baa561be6c 100644
--- a/contrib/restricted/boost/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/functional/CMakeLists.txt b/contrib/restricted/boost/functional/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/functional/CMakeLists.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/fusion/CMakeLists.darwin.txt b/contrib/restricted/boost/fusion/CMakeLists.darwin-x86_64.txt
index a26f5b12a3..a26f5b12a3 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/fusion/CMakeLists.linux.txt b/contrib/restricted/boost/fusion/CMakeLists.linux-x86_64.txt
index 6540394cad..6540394cad 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/fusion/CMakeLists.txt b/contrib/restricted/boost/fusion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/graph/CMakeLists.darwin.txt b/contrib/restricted/boost/graph/CMakeLists.darwin-x86_64.txt
index 9118ce39b6..9118ce39b6 100644
--- a/contrib/restricted/boost/graph/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/graph/CMakeLists.linux.txt b/contrib/restricted/boost/graph/CMakeLists.linux-x86_64.txt
index fd2c3cf33b..fd2c3cf33b 100644
--- a/contrib/restricted/boost/graph/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/graph/CMakeLists.txt b/contrib/restricted/boost/graph/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/graph/CMakeLists.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/icl/CMakeLists.darwin.txt b/contrib/restricted/boost/icl/CMakeLists.darwin-x86_64.txt
index b6b11aeab9..b6b11aeab9 100644
--- a/contrib/restricted/boost/icl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/icl/CMakeLists.linux.txt b/contrib/restricted/boost/icl/CMakeLists.linux-x86_64.txt
index 9f4aa50c8f..9f4aa50c8f 100644
--- a/contrib/restricted/boost/icl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/icl/CMakeLists.txt b/contrib/restricted/boost/icl/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/icl/CMakeLists.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/integer/CMakeLists.darwin.txt b/contrib/restricted/boost/integer/CMakeLists.darwin-x86_64.txt
index b8189c5a7a..b8189c5a7a 100644
--- a/contrib/restricted/boost/integer/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/integer/CMakeLists.linux.txt b/contrib/restricted/boost/integer/CMakeLists.linux-x86_64.txt
index 6fad3b6c9e..6fad3b6c9e 100644
--- a/contrib/restricted/boost/integer/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/integer/CMakeLists.txt b/contrib/restricted/boost/integer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/integer/CMakeLists.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt b/contrib/restricted/boost/interprocess/CMakeLists.darwin-x86_64.txt
index f95f9fc6c9..f95f9fc6c9 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt b/contrib/restricted/boost/interprocess/CMakeLists.linux-x86_64.txt
index 75abc5bc49..75abc5bc49 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.txt b/contrib/restricted/boost/interprocess/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.darwin.txt b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
index 261b65dc85..261b65dc85 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.linux.txt b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
index 0f15706c63..0f15706c63 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.txt b/contrib/restricted/boost/intrusive/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/io/CMakeLists.darwin.txt b/contrib/restricted/boost/io/CMakeLists.darwin-x86_64.txt
index 4aeba3ef01..4aeba3ef01 100644
--- a/contrib/restricted/boost/io/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/io/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/io/CMakeLists.linux.txt b/contrib/restricted/boost/io/CMakeLists.linux-x86_64.txt
index c7e646dfef..c7e646dfef 100644
--- a/contrib/restricted/boost/io/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/io/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/io/CMakeLists.txt b/contrib/restricted/boost/io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/io/CMakeLists.txt
+++ b/contrib/restricted/boost/io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt b/contrib/restricted/boost/iostreams/CMakeLists.darwin-x86_64.txt
index ecd5b2a38d..ecd5b2a38d 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt b/contrib/restricted/boost/iostreams/CMakeLists.linux-x86_64.txt
index 1d1e246dae..1d1e246dae 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.txt b/contrib/restricted/boost/iostreams/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/iterator/CMakeLists.darwin.txt b/contrib/restricted/boost/iterator/CMakeLists.darwin-x86_64.txt
index df59b473b2..df59b473b2 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/iterator/CMakeLists.linux.txt b/contrib/restricted/boost/iterator/CMakeLists.linux-x86_64.txt
index a1ebd81a38..a1ebd81a38 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/iterator/CMakeLists.txt b/contrib/restricted/boost/iterator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/lambda/CMakeLists.darwin.txt b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt
index f3556a1958..f3556a1958 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/lambda/CMakeLists.linux.txt b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt
index ba6f725ead..ba6f725ead 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/lambda/CMakeLists.txt b/contrib/restricted/boost/lambda/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin-x86_64.txt
index c4aff4db0d..c4aff4db0d 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-x86_64.txt
index d746f22bef..d746f22bef 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/locale/CMakeLists.darwin.txt b/contrib/restricted/boost/locale/CMakeLists.darwin-x86_64.txt
index 8e8b149e50..8e8b149e50 100644
--- a/contrib/restricted/boost/locale/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/locale/CMakeLists.linux.txt b/contrib/restricted/boost/locale/CMakeLists.linux-x86_64.txt
index 831330fafc..831330fafc 100644
--- a/contrib/restricted/boost/locale/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/locale/CMakeLists.txt b/contrib/restricted/boost/locale/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/locale/CMakeLists.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/math/CMakeLists.darwin.txt b/contrib/restricted/boost/math/CMakeLists.darwin-x86_64.txt
index 71d5facb39..71d5facb39 100644
--- a/contrib/restricted/boost/math/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/math/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/math/CMakeLists.linux.txt b/contrib/restricted/boost/math/CMakeLists.linux-x86_64.txt
index b8ed0bead8..b8ed0bead8 100644
--- a/contrib/restricted/boost/math/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/math/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/math/CMakeLists.txt b/contrib/restricted/boost/math/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/math/CMakeLists.txt
+++ b/contrib/restricted/boost/math/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/move/CMakeLists.darwin.txt b/contrib/restricted/boost/move/CMakeLists.darwin-x86_64.txt
index 37a8b34d94..37a8b34d94 100644
--- a/contrib/restricted/boost/move/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/move/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/move/CMakeLists.linux.txt b/contrib/restricted/boost/move/CMakeLists.linux-x86_64.txt
index d2a4daa075..d2a4daa075 100644
--- a/contrib/restricted/boost/move/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/move/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/move/CMakeLists.txt b/contrib/restricted/boost/move/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/move/CMakeLists.txt
+++ b/contrib/restricted/boost/move/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt b/contrib/restricted/boost/mp11/CMakeLists.darwin-x86_64.txt
index 7100a8f570..7100a8f570 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/mp11/CMakeLists.linux.txt b/contrib/restricted/boost/mp11/CMakeLists.linux-x86_64.txt
index 88c153c72c..88c153c72c 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/mp11/CMakeLists.txt b/contrib/restricted/boost/mp11/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/mpl/CMakeLists.darwin.txt b/contrib/restricted/boost/mpl/CMakeLists.darwin-x86_64.txt
index 8b161d3adf..8b161d3adf 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/mpl/CMakeLists.linux.txt b/contrib/restricted/boost/mpl/CMakeLists.linux-x86_64.txt
index 2a2813d50c..2a2813d50c 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/mpl/CMakeLists.txt b/contrib/restricted/boost/mpl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_array/CMakeLists.darwin-x86_64.txt
index 0f36dd5b20..0f36dd5b20 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.linux.txt b/contrib/restricted/boost/multi_array/CMakeLists.linux-x86_64.txt
index a9bf7bfcb3..a9bf7bfcb3 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.txt b/contrib/restricted/boost/multi_array/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_index/CMakeLists.darwin-x86_64.txt
index e8f6c61e6e..e8f6c61e6e 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt b/contrib/restricted/boost/multi_index/CMakeLists.linux-x86_64.txt
index fb769ceb01..fb769ceb01 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.txt b/contrib/restricted/boost/multi_index/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin-x86_64.txt
index c4797132e9..c4797132e9 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.linux.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.linux-x86_64.txt
index 46d33c5f9d..46d33c5f9d 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/optional/CMakeLists.darwin.txt b/contrib/restricted/boost/optional/CMakeLists.darwin-x86_64.txt
index b94f64d5c4..b94f64d5c4 100644
--- a/contrib/restricted/boost/optional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/optional/CMakeLists.linux.txt b/contrib/restricted/boost/optional/CMakeLists.linux-x86_64.txt
index 0bf5a6292d..0bf5a6292d 100644
--- a/contrib/restricted/boost/optional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/optional/CMakeLists.txt b/contrib/restricted/boost/optional/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/optional/CMakeLists.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt b/contrib/restricted/boost/parameter/CMakeLists.darwin-x86_64.txt
index 7aad728341..7aad728341 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/parameter/CMakeLists.linux.txt b/contrib/restricted/boost/parameter/CMakeLists.linux-x86_64.txt
index d5bb0e8b6e..d5bb0e8b6e 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/parameter/CMakeLists.txt b/contrib/restricted/boost/parameter/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.darwin.txt b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt
index 7bf8181aa5..7bf8181aa5 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.linux.txt b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt
index 80062339a3..80062339a3 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.txt b/contrib/restricted/boost/phoenix/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/pool/CMakeLists.darwin.txt b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt
index a0e50e5cde..a0e50e5cde 100644
--- a/contrib/restricted/boost/pool/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/pool/CMakeLists.linux.txt b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt
index a5d127cffb..a5d127cffb 100644
--- a/contrib/restricted/boost/pool/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/pool/CMakeLists.txt b/contrib/restricted/boost/pool/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/pool/CMakeLists.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/predef/CMakeLists.darwin.txt b/contrib/restricted/boost/predef/CMakeLists.darwin-x86_64.txt
index c55eab9d0f..c55eab9d0f 100644
--- a/contrib/restricted/boost/predef/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/predef/CMakeLists.linux.txt b/contrib/restricted/boost/predef/CMakeLists.linux-x86_64.txt
index a0087e3f0d..a0087e3f0d 100644
--- a/contrib/restricted/boost/predef/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/predef/CMakeLists.txt b/contrib/restricted/boost/predef/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/predef/CMakeLists.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.darwin.txt b/contrib/restricted/boost/preprocessor/CMakeLists.darwin-x86_64.txt
index 7df51769d9..7df51769d9 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.linux.txt b/contrib/restricted/boost/preprocessor/CMakeLists.linux-x86_64.txt
index e6e835b5ad..e6e835b5ad 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.txt b/contrib/restricted/boost/preprocessor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/program_options/CMakeLists.darwin.txt b/contrib/restricted/boost/program_options/CMakeLists.darwin-x86_64.txt
index c91dfc15c5..c91dfc15c5 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/program_options/CMakeLists.linux.txt b/contrib/restricted/boost/program_options/CMakeLists.linux-x86_64.txt
index 1bd268a977..1bd268a977 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/program_options/CMakeLists.txt b/contrib/restricted/boost/program_options/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt b/contrib/restricted/boost/property_map/CMakeLists.darwin-x86_64.txt
index d49456c891..d49456c891 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/property_map/CMakeLists.linux.txt b/contrib/restricted/boost/property_map/CMakeLists.linux-x86_64.txt
index cfb3bee945..cfb3bee945 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/property_map/CMakeLists.txt b/contrib/restricted/boost/property_map/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.darwin.txt b/contrib/restricted/boost/property_tree/CMakeLists.darwin-x86_64.txt
index 57f107d22d..57f107d22d 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.linux.txt b/contrib/restricted/boost/property_tree/CMakeLists.linux-x86_64.txt
index b64b977a64..b64b977a64 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.txt b/contrib/restricted/boost/property_tree/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/proto/CMakeLists.darwin.txt b/contrib/restricted/boost/proto/CMakeLists.darwin-x86_64.txt
index 370165e4ff..370165e4ff 100644
--- a/contrib/restricted/boost/proto/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/proto/CMakeLists.linux.txt b/contrib/restricted/boost/proto/CMakeLists.linux-x86_64.txt
index 8fa3b296b2..8fa3b296b2 100644
--- a/contrib/restricted/boost/proto/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/proto/CMakeLists.txt b/contrib/restricted/boost/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/proto/CMakeLists.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/random/CMakeLists.darwin.txt b/contrib/restricted/boost/random/CMakeLists.darwin-x86_64.txt
index 647aa94668..647aa94668 100644
--- a/contrib/restricted/boost/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/random/CMakeLists.linux.txt b/contrib/restricted/boost/random/CMakeLists.linux-x86_64.txt
index 23ae6c6152..23ae6c6152 100644
--- a/contrib/restricted/boost/random/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/random/CMakeLists.txt b/contrib/restricted/boost/random/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/random/CMakeLists.txt
+++ b/contrib/restricted/boost/random/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/range/CMakeLists.darwin.txt b/contrib/restricted/boost/range/CMakeLists.darwin-x86_64.txt
index eadd2f290c..eadd2f290c 100644
--- a/contrib/restricted/boost/range/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/range/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/range/CMakeLists.linux.txt b/contrib/restricted/boost/range/CMakeLists.linux-x86_64.txt
index a97889d7f6..a97889d7f6 100644
--- a/contrib/restricted/boost/range/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/range/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/range/CMakeLists.txt b/contrib/restricted/boost/range/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/range/CMakeLists.txt
+++ b/contrib/restricted/boost/range/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/ratio/CMakeLists.darwin.txt b/contrib/restricted/boost/ratio/CMakeLists.darwin-x86_64.txt
index 7171c49b08..7171c49b08 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/ratio/CMakeLists.linux.txt b/contrib/restricted/boost/ratio/CMakeLists.linux-x86_64.txt
index 90cac9ef7a..90cac9ef7a 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/ratio/CMakeLists.txt b/contrib/restricted/boost/ratio/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/rational/CMakeLists.darwin.txt b/contrib/restricted/boost/rational/CMakeLists.darwin-x86_64.txt
index c4d92a21a6..c4d92a21a6 100644
--- a/contrib/restricted/boost/rational/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/rational/CMakeLists.linux.txt b/contrib/restricted/boost/rational/CMakeLists.linux-x86_64.txt
index 61fd5149ab..61fd5149ab 100644
--- a/contrib/restricted/boost/rational/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/rational/CMakeLists.txt b/contrib/restricted/boost/rational/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/rational/CMakeLists.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/regex/CMakeLists.darwin.txt b/contrib/restricted/boost/regex/CMakeLists.darwin-x86_64.txt
index b0c67b4c88..b0c67b4c88 100644
--- a/contrib/restricted/boost/regex/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/regex/CMakeLists.linux.txt b/contrib/restricted/boost/regex/CMakeLists.linux-x86_64.txt
index 554805be78..554805be78 100644
--- a/contrib/restricted/boost/regex/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/regex/CMakeLists.txt b/contrib/restricted/boost/regex/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/regex/CMakeLists.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/serialization/CMakeLists.darwin.txt b/contrib/restricted/boost/serialization/CMakeLists.darwin-x86_64.txt
index 52603eb79d..52603eb79d 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/serialization/CMakeLists.linux.txt b/contrib/restricted/boost/serialization/CMakeLists.linux-x86_64.txt
index 43d01c0ab0..43d01c0ab0 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/serialization/CMakeLists.txt b/contrib/restricted/boost/serialization/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin-x86_64.txt
index e13c238580..e13c238580 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-x86_64.txt
index 1c30f857e3..1c30f857e3 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/spirit/CMakeLists.darwin.txt b/contrib/restricted/boost/spirit/CMakeLists.darwin-x86_64.txt
index 6a804f549d..6a804f549d 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/spirit/CMakeLists.linux.txt b/contrib/restricted/boost/spirit/CMakeLists.linux-x86_64.txt
index 01948379bb..01948379bb 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/spirit/CMakeLists.txt b/contrib/restricted/boost/spirit/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.darwin.txt b/contrib/restricted/boost/static_assert/CMakeLists.darwin-x86_64.txt
index 6506f1babd..6506f1babd 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.linux.txt b/contrib/restricted/boost/static_assert/CMakeLists.linux-x86_64.txt
index efc171911e..efc171911e 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.txt b/contrib/restricted/boost/static_assert/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/system/CMakeLists.darwin.txt b/contrib/restricted/boost/system/CMakeLists.darwin-x86_64.txt
index 49847620cb..49847620cb 100644
--- a/contrib/restricted/boost/system/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/system/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/system/CMakeLists.linux.txt b/contrib/restricted/boost/system/CMakeLists.linux-x86_64.txt
index bb535c4333..bb535c4333 100644
--- a/contrib/restricted/boost/system/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/system/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/system/CMakeLists.txt b/contrib/restricted/boost/system/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/system/CMakeLists.txt
+++ b/contrib/restricted/boost/system/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/thread/CMakeLists.darwin.txt b/contrib/restricted/boost/thread/CMakeLists.darwin-x86_64.txt
index 683da25426..683da25426 100644
--- a/contrib/restricted/boost/thread/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/thread/CMakeLists.linux.txt b/contrib/restricted/boost/thread/CMakeLists.linux-x86_64.txt
index ee0e2e1fcc..ee0e2e1fcc 100644
--- a/contrib/restricted/boost/thread/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/thread/CMakeLists.txt b/contrib/restricted/boost/thread/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/thread/CMakeLists.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.darwin.txt b/contrib/restricted/boost/throw_exception/CMakeLists.darwin-x86_64.txt
index eefa32cee2..eefa32cee2 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.linux.txt b/contrib/restricted/boost/throw_exception/CMakeLists.linux-x86_64.txt
index 105ee3325e..105ee3325e 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.txt b/contrib/restricted/boost/throw_exception/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.darwin.txt b/contrib/restricted/boost/tokenizer/CMakeLists.darwin-x86_64.txt
index 484614506f..484614506f 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.linux.txt b/contrib/restricted/boost/tokenizer/CMakeLists.linux-x86_64.txt
index f150b16ca2..f150b16ca2 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.txt b/contrib/restricted/boost/tokenizer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tti/CMakeLists.darwin.txt b/contrib/restricted/boost/tti/CMakeLists.darwin-x86_64.txt
index 21cde2d8ba..21cde2d8ba 100644
--- a/contrib/restricted/boost/tti/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tti/CMakeLists.linux.txt b/contrib/restricted/boost/tti/CMakeLists.linux-x86_64.txt
index 9c8dd5bc54..9c8dd5bc54 100644
--- a/contrib/restricted/boost/tti/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tti/CMakeLists.txt b/contrib/restricted/boost/tti/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/tti/CMakeLists.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tuple/CMakeLists.darwin.txt b/contrib/restricted/boost/tuple/CMakeLists.darwin-x86_64.txt
index 35051c1252..35051c1252 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tuple/CMakeLists.linux.txt b/contrib/restricted/boost/tuple/CMakeLists.linux-x86_64.txt
index de83f3637a..de83f3637a 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tuple/CMakeLists.txt b/contrib/restricted/boost/tuple/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt b/contrib/restricted/boost/type_index/CMakeLists.darwin-x86_64.txt
index e6366d2523..e6366d2523 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/type_index/CMakeLists.linux.txt b/contrib/restricted/boost/type_index/CMakeLists.linux-x86_64.txt
index 333b4a45fd..333b4a45fd 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/type_index/CMakeLists.txt b/contrib/restricted/boost/type_index/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt b/contrib/restricted/boost/type_traits/CMakeLists.darwin-x86_64.txt
index a32d4a750e..a32d4a750e 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt b/contrib/restricted/boost/type_traits/CMakeLists.linux-x86_64.txt
index 9771ff8a74..9771ff8a74 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.txt b/contrib/restricted/boost/type_traits/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt b/contrib/restricted/boost/typeof/CMakeLists.darwin-x86_64.txt
index 04fff27108..04fff27108 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/typeof/CMakeLists.linux.txt b/contrib/restricted/boost/typeof/CMakeLists.linux-x86_64.txt
index ff3ee3a266..ff3ee3a266 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/typeof/CMakeLists.txt b/contrib/restricted/boost/typeof/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/unordered/CMakeLists.darwin.txt b/contrib/restricted/boost/unordered/CMakeLists.darwin-x86_64.txt
index 0a1dbba096..0a1dbba096 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/unordered/CMakeLists.linux.txt b/contrib/restricted/boost/unordered/CMakeLists.linux-x86_64.txt
index 2c662b8703..2c662b8703 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/unordered/CMakeLists.txt b/contrib/restricted/boost/unordered/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/utility/CMakeLists.darwin.txt b/contrib/restricted/boost/utility/CMakeLists.darwin-x86_64.txt
index 75fd878529..75fd878529 100644
--- a/contrib/restricted/boost/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/utility/CMakeLists.linux.txt b/contrib/restricted/boost/utility/CMakeLists.linux-x86_64.txt
index a04da10363..a04da10363 100644
--- a/contrib/restricted/boost/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/utility/CMakeLists.txt b/contrib/restricted/boost/utility/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/utility/CMakeLists.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/variant/CMakeLists.darwin.txt b/contrib/restricted/boost/variant/CMakeLists.darwin-x86_64.txt
index 609c9606b8..609c9606b8 100644
--- a/contrib/restricted/boost/variant/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/variant/CMakeLists.linux.txt b/contrib/restricted/boost/variant/CMakeLists.linux-x86_64.txt
index 051a57fd90..051a57fd90 100644
--- a/contrib/restricted/boost/variant/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/variant/CMakeLists.txt b/contrib/restricted/boost/variant/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/variant/CMakeLists.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/variant2/CMakeLists.darwin.txt b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt
index faec5d9097..faec5d9097 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/variant2/CMakeLists.linux.txt b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt
index b3cdd31e10..b3cdd31e10 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/variant2/CMakeLists.txt b/contrib/restricted/boost/variant2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/winapi/CMakeLists.darwin.txt b/contrib/restricted/boost/winapi/CMakeLists.darwin-x86_64.txt
index 13fd04341f..13fd04341f 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/winapi/CMakeLists.linux.txt b/contrib/restricted/boost/winapi/CMakeLists.linux-x86_64.txt
index 08c0809361..08c0809361 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/winapi/CMakeLists.txt b/contrib/restricted/boost/winapi/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.darwin.txt b/contrib/restricted/boost/xpressive/CMakeLists.darwin-x86_64.txt
index d897400340..d897400340 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.linux.txt b/contrib/restricted/boost/xpressive/CMakeLists.linux-x86_64.txt
index ad59415763..ad59415763 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.txt b/contrib/restricted/boost/xpressive/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin-x86_64.txt
index d7518da2f4..d7518da2f4 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin.txt
+++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.linux.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.linux-x86_64.txt
index 1abb1abf0a..1abb1abf0a 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.linux.txt
+++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.txt
+++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/dragonbox/CMakeLists.darwin.txt b/contrib/restricted/dragonbox/CMakeLists.darwin-x86_64.txt
index 4e0fcd5b99..4e0fcd5b99 100644
--- a/contrib/restricted/dragonbox/CMakeLists.darwin.txt
+++ b/contrib/restricted/dragonbox/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/dragonbox/CMakeLists.linux.txt b/contrib/restricted/dragonbox/CMakeLists.linux-x86_64.txt
index 83a5cfb37c..83a5cfb37c 100644
--- a/contrib/restricted/dragonbox/CMakeLists.linux.txt
+++ b/contrib/restricted/dragonbox/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/dragonbox/CMakeLists.txt b/contrib/restricted/dragonbox/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/dragonbox/CMakeLists.txt
+++ b/contrib/restricted/dragonbox/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/fast_float/CMakeLists.darwin.txt b/contrib/restricted/fast_float/CMakeLists.darwin-x86_64.txt
index 277929ec2e..277929ec2e 100644
--- a/contrib/restricted/fast_float/CMakeLists.darwin.txt
+++ b/contrib/restricted/fast_float/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/fast_float/CMakeLists.linux.txt b/contrib/restricted/fast_float/CMakeLists.linux-x86_64.txt
index 4541d2ed55..4541d2ed55 100644
--- a/contrib/restricted/fast_float/CMakeLists.linux.txt
+++ b/contrib/restricted/fast_float/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/fast_float/CMakeLists.txt b/contrib/restricted/fast_float/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/fast_float/CMakeLists.txt
+++ b/contrib/restricted/fast_float/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.darwin.txt b/contrib/restricted/googletest/googlemock/CMakeLists.darwin-x86_64.txt
index 01df6b6ce7..01df6b6ce7 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.darwin.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.linux.txt b/contrib/restricted/googletest/googlemock/CMakeLists.linux-x86_64.txt
index d500700c45..d500700c45 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.linux.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.txt b/contrib/restricted/googletest/googlemock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.darwin.txt b/contrib/restricted/googletest/googletest/CMakeLists.darwin-x86_64.txt
index b28f00772f..b28f00772f 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.darwin.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.linux.txt b/contrib/restricted/googletest/googletest/CMakeLists.linux-x86_64.txt
index b04078314e..b04078314e 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.linux.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.txt b/contrib/restricted/googletest/googletest/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/nlohmann_json/CMakeLists.darwin.txt b/contrib/restricted/nlohmann_json/CMakeLists.darwin-x86_64.txt
index 0c96110bcc..0c96110bcc 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.darwin.txt
+++ b/contrib/restricted/nlohmann_json/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/nlohmann_json/CMakeLists.linux.txt b/contrib/restricted/nlohmann_json/CMakeLists.linux-x86_64.txt
index 2641b31de2..2641b31de2 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.linux.txt
+++ b/contrib/restricted/nlohmann_json/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/nlohmann_json/CMakeLists.txt b/contrib/restricted/nlohmann_json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.txt
+++ b/contrib/restricted/nlohmann_json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/thrift/CMakeLists.darwin.txt b/contrib/restricted/thrift/CMakeLists.darwin-x86_64.txt
index fcff6a7639..fcff6a7639 100644
--- a/contrib/restricted/thrift/CMakeLists.darwin.txt
+++ b/contrib/restricted/thrift/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/thrift/CMakeLists.linux.txt b/contrib/restricted/thrift/CMakeLists.linux-x86_64.txt
index daee3f2fa4..daee3f2fa4 100644
--- a/contrib/restricted/thrift/CMakeLists.linux.txt
+++ b/contrib/restricted/thrift/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/thrift/CMakeLists.txt b/contrib/restricted/thrift/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/thrift/CMakeLists.txt
+++ b/contrib/restricted/thrift/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/uriparser/CMakeLists.darwin.txt b/contrib/restricted/uriparser/CMakeLists.darwin-x86_64.txt
index 2163bfff7c..2163bfff7c 100644
--- a/contrib/restricted/uriparser/CMakeLists.darwin.txt
+++ b/contrib/restricted/uriparser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/uriparser/CMakeLists.linux.txt b/contrib/restricted/uriparser/CMakeLists.linux-x86_64.txt
index ef48e97a88..ef48e97a88 100644
--- a/contrib/restricted/uriparser/CMakeLists.linux.txt
+++ b/contrib/restricted/uriparser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/uriparser/CMakeLists.txt b/contrib/restricted/uriparser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/uriparser/CMakeLists.txt
+++ b/contrib/restricted/uriparser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/tools/protoc/bin/CMakeLists.darwin.txt b/contrib/tools/protoc/bin/CMakeLists.darwin-x86_64.txt
index c1676eedb9..c1676eedb9 100644
--- a/contrib/tools/protoc/bin/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/tools/protoc/bin/CMakeLists.linux.txt b/contrib/tools/protoc/bin/CMakeLists.linux-x86_64.txt
index 1a479939c5..1a479939c5 100644
--- a/contrib/tools/protoc/bin/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.linux-x86_64.txt
diff --git a/contrib/tools/protoc/bin/CMakeLists.txt b/contrib/tools/protoc/bin/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/tools/protoc/bin/CMakeLists.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin-x86_64.txt
index 6839a38ee9..6839a38ee9 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux-x86_64.txt
index 132a332978..132a332978 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux-x86_64.txt
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin-x86_64.txt
index 146ef843d1..146ef843d1 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux-x86_64.txt
index 642f45d4fd..642f45d4fd 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/CMakeLists.darwin.txt b/library/cpp/CMakeLists.darwin-x86_64.txt
index 2e5648a15c..2e5648a15c 100644
--- a/library/cpp/CMakeLists.darwin.txt
+++ b/library/cpp/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/CMakeLists.linux.txt b/library/cpp/CMakeLists.linux-x86_64.txt
index 2e5648a15c..2e5648a15c 100644
--- a/library/cpp/CMakeLists.linux.txt
+++ b/library/cpp/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/CMakeLists.txt b/library/cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/CMakeLists.txt
+++ b/library/cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/accurate_accumulate/CMakeLists.darwin.txt b/library/cpp/accurate_accumulate/CMakeLists.darwin-x86_64.txt
index 6d68faefed..6d68faefed 100644
--- a/library/cpp/accurate_accumulate/CMakeLists.darwin.txt
+++ b/library/cpp/accurate_accumulate/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/accurate_accumulate/CMakeLists.linux.txt b/library/cpp/accurate_accumulate/CMakeLists.linux-x86_64.txt
index d168ea5295..d168ea5295 100644
--- a/library/cpp/accurate_accumulate/CMakeLists.linux.txt
+++ b/library/cpp/accurate_accumulate/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/accurate_accumulate/CMakeLists.txt b/library/cpp/accurate_accumulate/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/accurate_accumulate/CMakeLists.txt
+++ b/library/cpp/accurate_accumulate/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/core/CMakeLists.darwin.txt b/library/cpp/actors/core/CMakeLists.darwin-x86_64.txt
index 7fe4e2c2ff..7fe4e2c2ff 100644
--- a/library/cpp/actors/core/CMakeLists.darwin.txt
+++ b/library/cpp/actors/core/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/core/CMakeLists.linux.txt b/library/cpp/actors/core/CMakeLists.linux-x86_64.txt
index e2a6cc1f08..e2a6cc1f08 100644
--- a/library/cpp/actors/core/CMakeLists.linux.txt
+++ b/library/cpp/actors/core/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/core/CMakeLists.txt b/library/cpp/actors/core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/core/CMakeLists.txt
+++ b/library/cpp/actors/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.darwin.txt b/library/cpp/actors/dnscachelib/CMakeLists.darwin-x86_64.txt
index 539f17a1a2..539f17a1a2 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.darwin.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.linux.txt b/library/cpp/actors/dnscachelib/CMakeLists.linux-x86_64.txt
index 03a286a663..03a286a663 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.linux.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.txt b/library/cpp/actors/dnscachelib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.darwin.txt b/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt
index 341f9e7593..341f9e7593 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.darwin.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.linux.txt b/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt
index 202d9028bc..202d9028bc 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.linux.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.txt b/library/cpp/actors/dnsresolver/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/helpers/CMakeLists.darwin.txt b/library/cpp/actors/helpers/CMakeLists.darwin-x86_64.txt
index 16ecfc7b98..16ecfc7b98 100644
--- a/library/cpp/actors/helpers/CMakeLists.darwin.txt
+++ b/library/cpp/actors/helpers/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/helpers/CMakeLists.linux.txt b/library/cpp/actors/helpers/CMakeLists.linux-x86_64.txt
index b00db82fde..b00db82fde 100644
--- a/library/cpp/actors/helpers/CMakeLists.linux.txt
+++ b/library/cpp/actors/helpers/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/helpers/CMakeLists.txt b/library/cpp/actors/helpers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/helpers/CMakeLists.txt
+++ b/library/cpp/actors/helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/http/CMakeLists.darwin.txt b/library/cpp/actors/http/CMakeLists.darwin-x86_64.txt
index c60599beaa..c60599beaa 100644
--- a/library/cpp/actors/http/CMakeLists.darwin.txt
+++ b/library/cpp/actors/http/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/http/CMakeLists.linux.txt b/library/cpp/actors/http/CMakeLists.linux-x86_64.txt
index d6e3868652..d6e3868652 100644
--- a/library/cpp/actors/http/CMakeLists.linux.txt
+++ b/library/cpp/actors/http/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/http/CMakeLists.txt b/library/cpp/actors/http/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/http/CMakeLists.txt
+++ b/library/cpp/actors/http/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/interconnect/CMakeLists.darwin.txt b/library/cpp/actors/interconnect/CMakeLists.darwin-x86_64.txt
index 49ad9e634b..49ad9e634b 100644
--- a/library/cpp/actors/interconnect/CMakeLists.darwin.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/interconnect/CMakeLists.linux.txt b/library/cpp/actors/interconnect/CMakeLists.linux-x86_64.txt
index 255f935cda..255f935cda 100644
--- a/library/cpp/actors/interconnect/CMakeLists.linux.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/interconnect/CMakeLists.txt b/library/cpp/actors/interconnect/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/interconnect/CMakeLists.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/interconnect/mock/CMakeLists.darwin.txt b/library/cpp/actors/interconnect/mock/CMakeLists.darwin-x86_64.txt
index c29d87b0ce..c29d87b0ce 100644
--- a/library/cpp/actors/interconnect/mock/CMakeLists.darwin.txt
+++ b/library/cpp/actors/interconnect/mock/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/interconnect/mock/CMakeLists.linux.txt b/library/cpp/actors/interconnect/mock/CMakeLists.linux-x86_64.txt
index 85d0cf4696..85d0cf4696 100644
--- a/library/cpp/actors/interconnect/mock/CMakeLists.linux.txt
+++ b/library/cpp/actors/interconnect/mock/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/interconnect/mock/CMakeLists.txt b/library/cpp/actors/interconnect/mock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/interconnect/mock/CMakeLists.txt
+++ b/library/cpp/actors/interconnect/mock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/log_backend/CMakeLists.darwin.txt b/library/cpp/actors/log_backend/CMakeLists.darwin-x86_64.txt
index 2845e78e35..2845e78e35 100644
--- a/library/cpp/actors/log_backend/CMakeLists.darwin.txt
+++ b/library/cpp/actors/log_backend/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/log_backend/CMakeLists.linux.txt b/library/cpp/actors/log_backend/CMakeLists.linux-x86_64.txt
index 15786d6c74..15786d6c74 100644
--- a/library/cpp/actors/log_backend/CMakeLists.linux.txt
+++ b/library/cpp/actors/log_backend/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/log_backend/CMakeLists.txt b/library/cpp/actors/log_backend/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/log_backend/CMakeLists.txt
+++ b/library/cpp/actors/log_backend/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/memory_log/CMakeLists.darwin.txt b/library/cpp/actors/memory_log/CMakeLists.darwin-x86_64.txt
index 5109f0fcce..5109f0fcce 100644
--- a/library/cpp/actors/memory_log/CMakeLists.darwin.txt
+++ b/library/cpp/actors/memory_log/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/memory_log/CMakeLists.linux.txt b/library/cpp/actors/memory_log/CMakeLists.linux-x86_64.txt
index 1fa79db3ff..1fa79db3ff 100644
--- a/library/cpp/actors/memory_log/CMakeLists.linux.txt
+++ b/library/cpp/actors/memory_log/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/memory_log/CMakeLists.txt b/library/cpp/actors/memory_log/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/memory_log/CMakeLists.txt
+++ b/library/cpp/actors/memory_log/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/prof/CMakeLists.darwin.txt b/library/cpp/actors/prof/CMakeLists.darwin-x86_64.txt
index 9ee960950d..9ee960950d 100644
--- a/library/cpp/actors/prof/CMakeLists.darwin.txt
+++ b/library/cpp/actors/prof/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/prof/CMakeLists.linux.txt b/library/cpp/actors/prof/CMakeLists.linux-x86_64.txt
index a7ee6c9586..a7ee6c9586 100644
--- a/library/cpp/actors/prof/CMakeLists.linux.txt
+++ b/library/cpp/actors/prof/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/prof/CMakeLists.txt b/library/cpp/actors/prof/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/prof/CMakeLists.txt
+++ b/library/cpp/actors/prof/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/protos/CMakeLists.darwin.txt b/library/cpp/actors/protos/CMakeLists.darwin-x86_64.txt
index be3257b127..be3257b127 100644
--- a/library/cpp/actors/protos/CMakeLists.darwin.txt
+++ b/library/cpp/actors/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/protos/CMakeLists.linux.txt b/library/cpp/actors/protos/CMakeLists.linux-x86_64.txt
index a9da706400..a9da706400 100644
--- a/library/cpp/actors/protos/CMakeLists.linux.txt
+++ b/library/cpp/actors/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/protos/CMakeLists.txt b/library/cpp/actors/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/protos/CMakeLists.txt
+++ b/library/cpp/actors/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/testlib/CMakeLists.darwin.txt b/library/cpp/actors/testlib/CMakeLists.darwin-x86_64.txt
index 1508c82e9b..1508c82e9b 100644
--- a/library/cpp/actors/testlib/CMakeLists.darwin.txt
+++ b/library/cpp/actors/testlib/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/testlib/CMakeLists.linux.txt b/library/cpp/actors/testlib/CMakeLists.linux-x86_64.txt
index 68cb3d3199..68cb3d3199 100644
--- a/library/cpp/actors/testlib/CMakeLists.linux.txt
+++ b/library/cpp/actors/testlib/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/testlib/CMakeLists.txt b/library/cpp/actors/testlib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/testlib/CMakeLists.txt
+++ b/library/cpp/actors/testlib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/util/CMakeLists.darwin.txt b/library/cpp/actors/util/CMakeLists.darwin-x86_64.txt
index 2bac6f5b8a..2bac6f5b8a 100644
--- a/library/cpp/actors/util/CMakeLists.darwin.txt
+++ b/library/cpp/actors/util/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/util/CMakeLists.linux.txt b/library/cpp/actors/util/CMakeLists.linux-x86_64.txt
index 9eebd23475..9eebd23475 100644
--- a/library/cpp/actors/util/CMakeLists.linux.txt
+++ b/library/cpp/actors/util/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/util/CMakeLists.txt b/library/cpp/actors/util/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/util/CMakeLists.txt
+++ b/library/cpp/actors/util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/wilson/CMakeLists.darwin.txt b/library/cpp/actors/wilson/CMakeLists.darwin-x86_64.txt
index 45704ccd5a..45704ccd5a 100644
--- a/library/cpp/actors/wilson/CMakeLists.darwin.txt
+++ b/library/cpp/actors/wilson/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/wilson/CMakeLists.linux.txt b/library/cpp/actors/wilson/CMakeLists.linux-x86_64.txt
index ccc87489ae..ccc87489ae 100644
--- a/library/cpp/actors/wilson/CMakeLists.linux.txt
+++ b/library/cpp/actors/wilson/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/wilson/CMakeLists.txt b/library/cpp/actors/wilson/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/wilson/CMakeLists.txt
+++ b/library/cpp/actors/wilson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.darwin.txt b/library/cpp/actors/wilson/protos/CMakeLists.darwin-x86_64.txt
index 5e21c8ffc3..5e21c8ffc3 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.darwin.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.linux.txt b/library/cpp/actors/wilson/protos/CMakeLists.linux-x86_64.txt
index d12c55767a..d12c55767a 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.linux.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/actors/wilson/protos/CMakeLists.txt b/library/cpp/actors/wilson/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/actors/wilson/protos/CMakeLists.txt
+++ b/library/cpp/actors/wilson/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/archive/CMakeLists.darwin.txt b/library/cpp/archive/CMakeLists.darwin-x86_64.txt
index 37c28ba02a..37c28ba02a 100644
--- a/library/cpp/archive/CMakeLists.darwin.txt
+++ b/library/cpp/archive/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/archive/CMakeLists.linux.txt b/library/cpp/archive/CMakeLists.linux-x86_64.txt
index 03631029dd..03631029dd 100644
--- a/library/cpp/archive/CMakeLists.linux.txt
+++ b/library/cpp/archive/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/archive/CMakeLists.txt b/library/cpp/archive/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/archive/CMakeLists.txt
+++ b/library/cpp/archive/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/balloc/CMakeLists.darwin.txt b/library/cpp/balloc/CMakeLists.darwin-x86_64.txt
index 08814068d1..08814068d1 100644
--- a/library/cpp/balloc/CMakeLists.darwin.txt
+++ b/library/cpp/balloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/balloc/CMakeLists.linux.txt b/library/cpp/balloc/CMakeLists.linux-x86_64.txt
index 8b703ab6d4..8b703ab6d4 100644
--- a/library/cpp/balloc/CMakeLists.linux.txt
+++ b/library/cpp/balloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/balloc/CMakeLists.txt b/library/cpp/balloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/balloc/CMakeLists.txt
+++ b/library/cpp/balloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/balloc/lib/CMakeLists.darwin.txt b/library/cpp/balloc/lib/CMakeLists.darwin-x86_64.txt
index 0444876681..0444876681 100644
--- a/library/cpp/balloc/lib/CMakeLists.darwin.txt
+++ b/library/cpp/balloc/lib/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/balloc/lib/CMakeLists.linux.txt b/library/cpp/balloc/lib/CMakeLists.linux-x86_64.txt
index 78dd3d4b90..78dd3d4b90 100644
--- a/library/cpp/balloc/lib/CMakeLists.linux.txt
+++ b/library/cpp/balloc/lib/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/balloc/lib/CMakeLists.txt b/library/cpp/balloc/lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/balloc/lib/CMakeLists.txt
+++ b/library/cpp/balloc/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/balloc/setup/CMakeLists.darwin.txt b/library/cpp/balloc/setup/CMakeLists.darwin-x86_64.txt
index 37f588f7f7..37f588f7f7 100644
--- a/library/cpp/balloc/setup/CMakeLists.darwin.txt
+++ b/library/cpp/balloc/setup/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/balloc/setup/CMakeLists.linux.txt b/library/cpp/balloc/setup/CMakeLists.linux-x86_64.txt
index aa604e5d20..aa604e5d20 100644
--- a/library/cpp/balloc/setup/CMakeLists.linux.txt
+++ b/library/cpp/balloc/setup/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/balloc/setup/CMakeLists.txt b/library/cpp/balloc/setup/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/balloc/setup/CMakeLists.txt
+++ b/library/cpp/balloc/setup/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/binsaver/CMakeLists.darwin.txt b/library/cpp/binsaver/CMakeLists.darwin-x86_64.txt
index 3430226be1..3430226be1 100644
--- a/library/cpp/binsaver/CMakeLists.darwin.txt
+++ b/library/cpp/binsaver/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/binsaver/CMakeLists.linux.txt b/library/cpp/binsaver/CMakeLists.linux-x86_64.txt
index 1a5048d32f..1a5048d32f 100644
--- a/library/cpp/binsaver/CMakeLists.linux.txt
+++ b/library/cpp/binsaver/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/binsaver/CMakeLists.txt b/library/cpp/binsaver/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/binsaver/CMakeLists.txt
+++ b/library/cpp/binsaver/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/bit_io/CMakeLists.darwin.txt b/library/cpp/bit_io/CMakeLists.darwin-x86_64.txt
index 3e27b7a842..3e27b7a842 100644
--- a/library/cpp/bit_io/CMakeLists.darwin.txt
+++ b/library/cpp/bit_io/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/bit_io/CMakeLists.linux.txt b/library/cpp/bit_io/CMakeLists.linux-x86_64.txt
index 35dab036ed..35dab036ed 100644
--- a/library/cpp/bit_io/CMakeLists.linux.txt
+++ b/library/cpp/bit_io/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/bit_io/CMakeLists.txt b/library/cpp/bit_io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/bit_io/CMakeLists.txt
+++ b/library/cpp/bit_io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/CMakeLists.darwin.txt b/library/cpp/blockcodecs/CMakeLists.darwin-x86_64.txt
index 3b5f212510..3b5f212510 100644
--- a/library/cpp/blockcodecs/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/CMakeLists.linux.txt b/library/cpp/blockcodecs/CMakeLists.linux-x86_64.txt
index 4b75027197..4b75027197 100644
--- a/library/cpp/blockcodecs/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/CMakeLists.txt b/library/cpp/blockcodecs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/CMakeLists.txt
+++ b/library/cpp/blockcodecs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.darwin-x86_64.txt
index 0af596c5de..0af596c5de 100644
--- a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.linux-x86_64.txt
index ccb11a5288..ccb11a5288 100644
--- a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.darwin-x86_64.txt
index fd7180543c..fd7180543c 100644
--- a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.linux-x86_64.txt
index cb9bd53db1..cb9bd53db1 100644
--- a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.darwin-x86_64.txt
index 0acda91a4d..0acda91a4d 100644
--- a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.linux-x86_64.txt
index 841e41dc33..841e41dc33 100644
--- a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.darwin-x86_64.txt
index c6d20bf8fc..c6d20bf8fc 100644
--- a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.linux-x86_64.txt
index e0dbc8de82..e0dbc8de82 100644
--- a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.darwin-x86_64.txt
index 92e6f5f9db..92e6f5f9db 100644
--- a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.linux-x86_64.txt
index 0d4874b329..0d4874b329 100644
--- a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/lz4/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.darwin-x86_64.txt
index acaf2f9e8d..acaf2f9e8d 100644
--- a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.linux-x86_64.txt
index 0fee0bb18d..0fee0bb18d 100644
--- a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/lzma/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.darwin-x86_64.txt
index 995fd58dfc..995fd58dfc 100644
--- a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.linux-x86_64.txt
index de6eef3de0..de6eef3de0 100644
--- a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/snappy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin-x86_64.txt
index 2e13dbce8c..2e13dbce8c 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-x86_64.txt
index 22fe89535f..22fe89535f 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.darwin.txt b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.darwin-x86_64.txt
index 894ad9b9a8..894ad9b9a8 100644
--- a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.linux.txt b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.linux-x86_64.txt
index 46c472e81f..46c472e81f 100644
--- a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt
+++ b/library/cpp/blockcodecs/codecs/zstd/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/blockcodecs/core/CMakeLists.darwin.txt b/library/cpp/blockcodecs/core/CMakeLists.darwin-x86_64.txt
index c49c7d01b8..c49c7d01b8 100644
--- a/library/cpp/blockcodecs/core/CMakeLists.darwin.txt
+++ b/library/cpp/blockcodecs/core/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/blockcodecs/core/CMakeLists.linux.txt b/library/cpp/blockcodecs/core/CMakeLists.linux-x86_64.txt
index 407f8f62e1..407f8f62e1 100644
--- a/library/cpp/blockcodecs/core/CMakeLists.linux.txt
+++ b/library/cpp/blockcodecs/core/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/blockcodecs/core/CMakeLists.txt b/library/cpp/blockcodecs/core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/blockcodecs/core/CMakeLists.txt
+++ b/library/cpp/blockcodecs/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/bucket_quoter/CMakeLists.darwin.txt b/library/cpp/bucket_quoter/CMakeLists.darwin-x86_64.txt
index 64ef18e5d9..64ef18e5d9 100644
--- a/library/cpp/bucket_quoter/CMakeLists.darwin.txt
+++ b/library/cpp/bucket_quoter/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/bucket_quoter/CMakeLists.linux.txt b/library/cpp/bucket_quoter/CMakeLists.linux-x86_64.txt
index 249edbf20a..249edbf20a 100644
--- a/library/cpp/bucket_quoter/CMakeLists.linux.txt
+++ b/library/cpp/bucket_quoter/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/bucket_quoter/CMakeLists.txt b/library/cpp/bucket_quoter/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/bucket_quoter/CMakeLists.txt
+++ b/library/cpp/bucket_quoter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/build_info/CMakeLists.darwin.txt b/library/cpp/build_info/CMakeLists.darwin-x86_64.txt
index a749cac8a0..a749cac8a0 100644
--- a/library/cpp/build_info/CMakeLists.darwin.txt
+++ b/library/cpp/build_info/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/build_info/CMakeLists.linux.txt b/library/cpp/build_info/CMakeLists.linux-x86_64.txt
index 7067bdf107..7067bdf107 100644
--- a/library/cpp/build_info/CMakeLists.linux.txt
+++ b/library/cpp/build_info/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/build_info/CMakeLists.txt b/library/cpp/build_info/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/build_info/CMakeLists.txt
+++ b/library/cpp/build_info/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/cache/CMakeLists.darwin.txt b/library/cpp/cache/CMakeLists.darwin-x86_64.txt
index 82cae52ee2..82cae52ee2 100644
--- a/library/cpp/cache/CMakeLists.darwin.txt
+++ b/library/cpp/cache/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/cache/CMakeLists.linux.txt b/library/cpp/cache/CMakeLists.linux-x86_64.txt
index 4278ad1c77..4278ad1c77 100644
--- a/library/cpp/cache/CMakeLists.linux.txt
+++ b/library/cpp/cache/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/cache/CMakeLists.txt b/library/cpp/cache/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/cache/CMakeLists.txt
+++ b/library/cpp/cache/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/case_insensitive_string/CMakeLists.darwin.txt b/library/cpp/case_insensitive_string/CMakeLists.darwin-x86_64.txt
index d6d3602e2d..d6d3602e2d 100644
--- a/library/cpp/case_insensitive_string/CMakeLists.darwin.txt
+++ b/library/cpp/case_insensitive_string/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/case_insensitive_string/CMakeLists.linux.txt b/library/cpp/case_insensitive_string/CMakeLists.linux-x86_64.txt
index d02118b8f7..d02118b8f7 100644
--- a/library/cpp/case_insensitive_string/CMakeLists.linux.txt
+++ b/library/cpp/case_insensitive_string/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/case_insensitive_string/CMakeLists.txt b/library/cpp/case_insensitive_string/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/case_insensitive_string/CMakeLists.txt
+++ b/library/cpp/case_insensitive_string/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/cgiparam/CMakeLists.darwin.txt b/library/cpp/cgiparam/CMakeLists.darwin-x86_64.txt
index 186d00a938..186d00a938 100644
--- a/library/cpp/cgiparam/CMakeLists.darwin.txt
+++ b/library/cpp/cgiparam/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/cgiparam/CMakeLists.linux.txt b/library/cpp/cgiparam/CMakeLists.linux-x86_64.txt
index eec57f881a..eec57f881a 100644
--- a/library/cpp/cgiparam/CMakeLists.linux.txt
+++ b/library/cpp/cgiparam/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/cgiparam/CMakeLists.txt b/library/cpp/cgiparam/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/cgiparam/CMakeLists.txt
+++ b/library/cpp/cgiparam/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/charset/CMakeLists.darwin.txt b/library/cpp/charset/CMakeLists.darwin-x86_64.txt
index 2be179087c..2be179087c 100644
--- a/library/cpp/charset/CMakeLists.darwin.txt
+++ b/library/cpp/charset/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/charset/CMakeLists.linux.txt b/library/cpp/charset/CMakeLists.linux-x86_64.txt
index b2e97648f9..b2e97648f9 100644
--- a/library/cpp/charset/CMakeLists.linux.txt
+++ b/library/cpp/charset/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/charset/CMakeLists.txt b/library/cpp/charset/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/charset/CMakeLists.txt
+++ b/library/cpp/charset/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/codecs/CMakeLists.darwin.txt b/library/cpp/codecs/CMakeLists.darwin-x86_64.txt
index 2bc3133ce1..2bc3133ce1 100644
--- a/library/cpp/codecs/CMakeLists.darwin.txt
+++ b/library/cpp/codecs/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/codecs/CMakeLists.linux.txt b/library/cpp/codecs/CMakeLists.linux-x86_64.txt
index e70090edcb..e70090edcb 100644
--- a/library/cpp/codecs/CMakeLists.linux.txt
+++ b/library/cpp/codecs/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/codecs/CMakeLists.txt b/library/cpp/codecs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/codecs/CMakeLists.txt
+++ b/library/cpp/codecs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/codecs/greedy_dict/CMakeLists.darwin.txt b/library/cpp/codecs/greedy_dict/CMakeLists.darwin-x86_64.txt
index 7f06cf83d8..7f06cf83d8 100644
--- a/library/cpp/codecs/greedy_dict/CMakeLists.darwin.txt
+++ b/library/cpp/codecs/greedy_dict/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/codecs/greedy_dict/CMakeLists.linux.txt b/library/cpp/codecs/greedy_dict/CMakeLists.linux-x86_64.txt
index 734416a527..734416a527 100644
--- a/library/cpp/codecs/greedy_dict/CMakeLists.linux.txt
+++ b/library/cpp/codecs/greedy_dict/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/codecs/greedy_dict/CMakeLists.txt b/library/cpp/codecs/greedy_dict/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/codecs/greedy_dict/CMakeLists.txt
+++ b/library/cpp/codecs/greedy_dict/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/colorizer/CMakeLists.darwin.txt b/library/cpp/colorizer/CMakeLists.darwin-x86_64.txt
index a47c86d7ea..a47c86d7ea 100644
--- a/library/cpp/colorizer/CMakeLists.darwin.txt
+++ b/library/cpp/colorizer/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/colorizer/CMakeLists.linux.txt b/library/cpp/colorizer/CMakeLists.linux-x86_64.txt
index d407d96e14..d407d96e14 100644
--- a/library/cpp/colorizer/CMakeLists.linux.txt
+++ b/library/cpp/colorizer/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/colorizer/CMakeLists.txt b/library/cpp/colorizer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/colorizer/CMakeLists.txt
+++ b/library/cpp/colorizer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/compproto/CMakeLists.darwin.txt b/library/cpp/compproto/CMakeLists.darwin-x86_64.txt
index abcc95d486..abcc95d486 100644
--- a/library/cpp/compproto/CMakeLists.darwin.txt
+++ b/library/cpp/compproto/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/compproto/CMakeLists.linux.txt b/library/cpp/compproto/CMakeLists.linux-x86_64.txt
index f7c1ee7be7..f7c1ee7be7 100644
--- a/library/cpp/compproto/CMakeLists.linux.txt
+++ b/library/cpp/compproto/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/compproto/CMakeLists.txt b/library/cpp/compproto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/compproto/CMakeLists.txt
+++ b/library/cpp/compproto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/comptable/CMakeLists.darwin.txt b/library/cpp/comptable/CMakeLists.darwin-x86_64.txt
index e695ca6521..e695ca6521 100644
--- a/library/cpp/comptable/CMakeLists.darwin.txt
+++ b/library/cpp/comptable/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/comptable/CMakeLists.linux.txt b/library/cpp/comptable/CMakeLists.linux-x86_64.txt
index d438e07d93..d438e07d93 100644
--- a/library/cpp/comptable/CMakeLists.linux.txt
+++ b/library/cpp/comptable/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/comptable/CMakeLists.txt b/library/cpp/comptable/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/comptable/CMakeLists.txt
+++ b/library/cpp/comptable/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/config/CMakeLists.darwin.txt b/library/cpp/config/CMakeLists.darwin-x86_64.txt
index 23c772e4fc..23c772e4fc 100644
--- a/library/cpp/config/CMakeLists.darwin.txt
+++ b/library/cpp/config/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/config/CMakeLists.linux.txt b/library/cpp/config/CMakeLists.linux-x86_64.txt
index 3e91ece220..3e91ece220 100644
--- a/library/cpp/config/CMakeLists.linux.txt
+++ b/library/cpp/config/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/config/CMakeLists.txt b/library/cpp/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/config/CMakeLists.txt
+++ b/library/cpp/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/2d_array/CMakeLists.darwin.txt b/library/cpp/containers/2d_array/CMakeLists.darwin-x86_64.txt
index c1371c0def..c1371c0def 100644
--- a/library/cpp/containers/2d_array/CMakeLists.darwin.txt
+++ b/library/cpp/containers/2d_array/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/2d_array/CMakeLists.linux.txt b/library/cpp/containers/2d_array/CMakeLists.linux-x86_64.txt
index 25140f3dc9..25140f3dc9 100644
--- a/library/cpp/containers/2d_array/CMakeLists.linux.txt
+++ b/library/cpp/containers/2d_array/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/2d_array/CMakeLists.txt b/library/cpp/containers/2d_array/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/2d_array/CMakeLists.txt
+++ b/library/cpp/containers/2d_array/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/absl_flat_hash/CMakeLists.darwin.txt b/library/cpp/containers/absl_flat_hash/CMakeLists.darwin-x86_64.txt
index 4ab79d02db..4ab79d02db 100644
--- a/library/cpp/containers/absl_flat_hash/CMakeLists.darwin.txt
+++ b/library/cpp/containers/absl_flat_hash/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/absl_flat_hash/CMakeLists.linux.txt b/library/cpp/containers/absl_flat_hash/CMakeLists.linux-x86_64.txt
index 379fc48361..379fc48361 100644
--- a/library/cpp/containers/absl_flat_hash/CMakeLists.linux.txt
+++ b/library/cpp/containers/absl_flat_hash/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/absl_flat_hash/CMakeLists.txt b/library/cpp/containers/absl_flat_hash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/absl_flat_hash/CMakeLists.txt
+++ b/library/cpp/containers/absl_flat_hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/atomizer/CMakeLists.darwin.txt b/library/cpp/containers/atomizer/CMakeLists.darwin-x86_64.txt
index d0486e1c36..d0486e1c36 100644
--- a/library/cpp/containers/atomizer/CMakeLists.darwin.txt
+++ b/library/cpp/containers/atomizer/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/atomizer/CMakeLists.linux.txt b/library/cpp/containers/atomizer/CMakeLists.linux-x86_64.txt
index 2db431da3f..2db431da3f 100644
--- a/library/cpp/containers/atomizer/CMakeLists.linux.txt
+++ b/library/cpp/containers/atomizer/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/atomizer/CMakeLists.txt b/library/cpp/containers/atomizer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/atomizer/CMakeLists.txt
+++ b/library/cpp/containers/atomizer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/bitseq/CMakeLists.darwin.txt b/library/cpp/containers/bitseq/CMakeLists.darwin-x86_64.txt
index 97b139a7fa..97b139a7fa 100644
--- a/library/cpp/containers/bitseq/CMakeLists.darwin.txt
+++ b/library/cpp/containers/bitseq/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/bitseq/CMakeLists.linux.txt b/library/cpp/containers/bitseq/CMakeLists.linux-x86_64.txt
index 758be4fd4c..758be4fd4c 100644
--- a/library/cpp/containers/bitseq/CMakeLists.linux.txt
+++ b/library/cpp/containers/bitseq/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/bitseq/CMakeLists.txt b/library/cpp/containers/bitseq/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/bitseq/CMakeLists.txt
+++ b/library/cpp/containers/bitseq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/compact_vector/CMakeLists.darwin.txt b/library/cpp/containers/compact_vector/CMakeLists.darwin-x86_64.txt
index 57d3af0a1b..57d3af0a1b 100644
--- a/library/cpp/containers/compact_vector/CMakeLists.darwin.txt
+++ b/library/cpp/containers/compact_vector/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/compact_vector/CMakeLists.linux.txt b/library/cpp/containers/compact_vector/CMakeLists.linux-x86_64.txt
index a2171479e9..a2171479e9 100644
--- a/library/cpp/containers/compact_vector/CMakeLists.linux.txt
+++ b/library/cpp/containers/compact_vector/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/compact_vector/CMakeLists.txt b/library/cpp/containers/compact_vector/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/compact_vector/CMakeLists.txt
+++ b/library/cpp/containers/compact_vector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/comptrie/CMakeLists.darwin.txt b/library/cpp/containers/comptrie/CMakeLists.darwin-x86_64.txt
index 3a3d86aed7..3a3d86aed7 100644
--- a/library/cpp/containers/comptrie/CMakeLists.darwin.txt
+++ b/library/cpp/containers/comptrie/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/comptrie/CMakeLists.linux.txt b/library/cpp/containers/comptrie/CMakeLists.linux-x86_64.txt
index 599cc37088..599cc37088 100644
--- a/library/cpp/containers/comptrie/CMakeLists.linux.txt
+++ b/library/cpp/containers/comptrie/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/comptrie/CMakeLists.txt b/library/cpp/containers/comptrie/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/comptrie/CMakeLists.txt
+++ b/library/cpp/containers/comptrie/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/disjoint_interval_tree/CMakeLists.darwin.txt b/library/cpp/containers/disjoint_interval_tree/CMakeLists.darwin-x86_64.txt
index 1fd4597d59..1fd4597d59 100644
--- a/library/cpp/containers/disjoint_interval_tree/CMakeLists.darwin.txt
+++ b/library/cpp/containers/disjoint_interval_tree/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/disjoint_interval_tree/CMakeLists.linux.txt b/library/cpp/containers/disjoint_interval_tree/CMakeLists.linux-x86_64.txt
index c62ad5f23c..c62ad5f23c 100644
--- a/library/cpp/containers/disjoint_interval_tree/CMakeLists.linux.txt
+++ b/library/cpp/containers/disjoint_interval_tree/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt b/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt
+++ b/library/cpp/containers/disjoint_interval_tree/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/flat_hash/CMakeLists.darwin.txt b/library/cpp/containers/flat_hash/CMakeLists.darwin-x86_64.txt
index 17eb5a21b7..17eb5a21b7 100644
--- a/library/cpp/containers/flat_hash/CMakeLists.darwin.txt
+++ b/library/cpp/containers/flat_hash/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/flat_hash/CMakeLists.linux.txt b/library/cpp/containers/flat_hash/CMakeLists.linux-x86_64.txt
index d5ab2865c7..d5ab2865c7 100644
--- a/library/cpp/containers/flat_hash/CMakeLists.linux.txt
+++ b/library/cpp/containers/flat_hash/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/flat_hash/CMakeLists.txt b/library/cpp/containers/flat_hash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/flat_hash/CMakeLists.txt
+++ b/library/cpp/containers/flat_hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/intrusive_avl_tree/CMakeLists.darwin.txt b/library/cpp/containers/intrusive_avl_tree/CMakeLists.darwin-x86_64.txt
index 651df561c1..651df561c1 100644
--- a/library/cpp/containers/intrusive_avl_tree/CMakeLists.darwin.txt
+++ b/library/cpp/containers/intrusive_avl_tree/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/intrusive_avl_tree/CMakeLists.linux.txt b/library/cpp/containers/intrusive_avl_tree/CMakeLists.linux-x86_64.txt
index b558f155bc..b558f155bc 100644
--- a/library/cpp/containers/intrusive_avl_tree/CMakeLists.linux.txt
+++ b/library/cpp/containers/intrusive_avl_tree/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/intrusive_avl_tree/CMakeLists.txt b/library/cpp/containers/intrusive_avl_tree/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/intrusive_avl_tree/CMakeLists.txt
+++ b/library/cpp/containers/intrusive_avl_tree/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/intrusive_rb_tree/CMakeLists.darwin.txt b/library/cpp/containers/intrusive_rb_tree/CMakeLists.darwin-x86_64.txt
index 45d7acb838..45d7acb838 100644
--- a/library/cpp/containers/intrusive_rb_tree/CMakeLists.darwin.txt
+++ b/library/cpp/containers/intrusive_rb_tree/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/intrusive_rb_tree/CMakeLists.linux.txt b/library/cpp/containers/intrusive_rb_tree/CMakeLists.linux-x86_64.txt
index 82927607d1..82927607d1 100644
--- a/library/cpp/containers/intrusive_rb_tree/CMakeLists.linux.txt
+++ b/library/cpp/containers/intrusive_rb_tree/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt b/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt
+++ b/library/cpp/containers/intrusive_rb_tree/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/paged_vector/CMakeLists.darwin.txt b/library/cpp/containers/paged_vector/CMakeLists.darwin-x86_64.txt
index c44af664bc..c44af664bc 100644
--- a/library/cpp/containers/paged_vector/CMakeLists.darwin.txt
+++ b/library/cpp/containers/paged_vector/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/paged_vector/CMakeLists.linux.txt b/library/cpp/containers/paged_vector/CMakeLists.linux-x86_64.txt
index b1f740cc45..b1f740cc45 100644
--- a/library/cpp/containers/paged_vector/CMakeLists.linux.txt
+++ b/library/cpp/containers/paged_vector/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/paged_vector/CMakeLists.txt b/library/cpp/containers/paged_vector/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/paged_vector/CMakeLists.txt
+++ b/library/cpp/containers/paged_vector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/ring_buffer/CMakeLists.darwin.txt b/library/cpp/containers/ring_buffer/CMakeLists.darwin-x86_64.txt
index 490e1427d4..490e1427d4 100644
--- a/library/cpp/containers/ring_buffer/CMakeLists.darwin.txt
+++ b/library/cpp/containers/ring_buffer/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/ring_buffer/CMakeLists.linux.txt b/library/cpp/containers/ring_buffer/CMakeLists.linux-x86_64.txt
index 59e7ab0928..59e7ab0928 100644
--- a/library/cpp/containers/ring_buffer/CMakeLists.linux.txt
+++ b/library/cpp/containers/ring_buffer/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/ring_buffer/CMakeLists.txt b/library/cpp/containers/ring_buffer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/ring_buffer/CMakeLists.txt
+++ b/library/cpp/containers/ring_buffer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/sorted_vector/CMakeLists.darwin.txt b/library/cpp/containers/sorted_vector/CMakeLists.darwin-x86_64.txt
index e1438df974..e1438df974 100644
--- a/library/cpp/containers/sorted_vector/CMakeLists.darwin.txt
+++ b/library/cpp/containers/sorted_vector/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/sorted_vector/CMakeLists.linux.txt b/library/cpp/containers/sorted_vector/CMakeLists.linux-x86_64.txt
index 8af3de1300..8af3de1300 100644
--- a/library/cpp/containers/sorted_vector/CMakeLists.linux.txt
+++ b/library/cpp/containers/sorted_vector/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/sorted_vector/CMakeLists.txt b/library/cpp/containers/sorted_vector/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/sorted_vector/CMakeLists.txt
+++ b/library/cpp/containers/sorted_vector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/stack_array/CMakeLists.darwin.txt b/library/cpp/containers/stack_array/CMakeLists.darwin-x86_64.txt
index 83fde56a05..83fde56a05 100644
--- a/library/cpp/containers/stack_array/CMakeLists.darwin.txt
+++ b/library/cpp/containers/stack_array/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/stack_array/CMakeLists.linux.txt b/library/cpp/containers/stack_array/CMakeLists.linux-x86_64.txt
index 1d3d430a32..1d3d430a32 100644
--- a/library/cpp/containers/stack_array/CMakeLists.linux.txt
+++ b/library/cpp/containers/stack_array/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/stack_array/CMakeLists.txt b/library/cpp/containers/stack_array/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/stack_array/CMakeLists.txt
+++ b/library/cpp/containers/stack_array/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/stack_vector/CMakeLists.darwin.txt b/library/cpp/containers/stack_vector/CMakeLists.darwin-x86_64.txt
index 2950b6b535..2950b6b535 100644
--- a/library/cpp/containers/stack_vector/CMakeLists.darwin.txt
+++ b/library/cpp/containers/stack_vector/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/stack_vector/CMakeLists.linux.txt b/library/cpp/containers/stack_vector/CMakeLists.linux-x86_64.txt
index c4bb46961f..c4bb46961f 100644
--- a/library/cpp/containers/stack_vector/CMakeLists.linux.txt
+++ b/library/cpp/containers/stack_vector/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/stack_vector/CMakeLists.txt b/library/cpp/containers/stack_vector/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/stack_vector/CMakeLists.txt
+++ b/library/cpp/containers/stack_vector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/str_map/CMakeLists.darwin.txt b/library/cpp/containers/str_map/CMakeLists.darwin-x86_64.txt
index ee42c250c6..ee42c250c6 100644
--- a/library/cpp/containers/str_map/CMakeLists.darwin.txt
+++ b/library/cpp/containers/str_map/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/str_map/CMakeLists.linux.txt b/library/cpp/containers/str_map/CMakeLists.linux-x86_64.txt
index e78f115ba1..e78f115ba1 100644
--- a/library/cpp/containers/str_map/CMakeLists.linux.txt
+++ b/library/cpp/containers/str_map/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/str_map/CMakeLists.txt b/library/cpp/containers/str_map/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/str_map/CMakeLists.txt
+++ b/library/cpp/containers/str_map/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/containers/top_keeper/CMakeLists.darwin.txt b/library/cpp/containers/top_keeper/CMakeLists.darwin-x86_64.txt
index cc2996b511..cc2996b511 100644
--- a/library/cpp/containers/top_keeper/CMakeLists.darwin.txt
+++ b/library/cpp/containers/top_keeper/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/containers/top_keeper/CMakeLists.linux.txt b/library/cpp/containers/top_keeper/CMakeLists.linux-x86_64.txt
index 0549b8da46..0549b8da46 100644
--- a/library/cpp/containers/top_keeper/CMakeLists.linux.txt
+++ b/library/cpp/containers/top_keeper/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/containers/top_keeper/CMakeLists.txt b/library/cpp/containers/top_keeper/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/containers/top_keeper/CMakeLists.txt
+++ b/library/cpp/containers/top_keeper/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/coroutine/engine/CMakeLists.darwin.txt b/library/cpp/coroutine/engine/CMakeLists.darwin-x86_64.txt
index d709a1e943..d709a1e943 100644
--- a/library/cpp/coroutine/engine/CMakeLists.darwin.txt
+++ b/library/cpp/coroutine/engine/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/coroutine/engine/CMakeLists.linux.txt b/library/cpp/coroutine/engine/CMakeLists.linux-x86_64.txt
index b2912afd4c..b2912afd4c 100644
--- a/library/cpp/coroutine/engine/CMakeLists.linux.txt
+++ b/library/cpp/coroutine/engine/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/coroutine/engine/CMakeLists.txt b/library/cpp/coroutine/engine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/coroutine/engine/CMakeLists.txt
+++ b/library/cpp/coroutine/engine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/coroutine/listener/CMakeLists.darwin.txt b/library/cpp/coroutine/listener/CMakeLists.darwin-x86_64.txt
index 125cb4b2ed..125cb4b2ed 100644
--- a/library/cpp/coroutine/listener/CMakeLists.darwin.txt
+++ b/library/cpp/coroutine/listener/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/coroutine/listener/CMakeLists.linux.txt b/library/cpp/coroutine/listener/CMakeLists.linux-x86_64.txt
index 6e1b4b95d1..6e1b4b95d1 100644
--- a/library/cpp/coroutine/listener/CMakeLists.linux.txt
+++ b/library/cpp/coroutine/listener/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/coroutine/listener/CMakeLists.txt b/library/cpp/coroutine/listener/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/coroutine/listener/CMakeLists.txt
+++ b/library/cpp/coroutine/listener/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/cppparser/CMakeLists.darwin.txt b/library/cpp/cppparser/CMakeLists.darwin-x86_64.txt
index 73f1df8e6f..73f1df8e6f 100644
--- a/library/cpp/cppparser/CMakeLists.darwin.txt
+++ b/library/cpp/cppparser/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/cppparser/CMakeLists.linux.txt b/library/cpp/cppparser/CMakeLists.linux-x86_64.txt
index 1e9530b77d..1e9530b77d 100644
--- a/library/cpp/cppparser/CMakeLists.linux.txt
+++ b/library/cpp/cppparser/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/cppparser/CMakeLists.txt b/library/cpp/cppparser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/cppparser/CMakeLists.txt
+++ b/library/cpp/cppparser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/cpuid_check/CMakeLists.darwin.txt b/library/cpp/cpuid_check/CMakeLists.darwin-x86_64.txt
index 78664f1ffe..78664f1ffe 100644
--- a/library/cpp/cpuid_check/CMakeLists.darwin.txt
+++ b/library/cpp/cpuid_check/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/cpuid_check/CMakeLists.linux.txt b/library/cpp/cpuid_check/CMakeLists.linux-x86_64.txt
index a45f22e5e3..a45f22e5e3 100644
--- a/library/cpp/cpuid_check/CMakeLists.linux.txt
+++ b/library/cpp/cpuid_check/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/cpuid_check/CMakeLists.txt b/library/cpp/cpuid_check/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/library/cpp/cpuid_check/CMakeLists.txt
+++ b/library/cpp/cpuid_check/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/dbg_output/CMakeLists.darwin.txt b/library/cpp/dbg_output/CMakeLists.darwin-x86_64.txt
index 6e29430ec2..6e29430ec2 100644
--- a/library/cpp/dbg_output/CMakeLists.darwin.txt
+++ b/library/cpp/dbg_output/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/dbg_output/CMakeLists.linux.txt b/library/cpp/dbg_output/CMakeLists.linux-x86_64.txt
index 1e819ca723..1e819ca723 100644
--- a/library/cpp/dbg_output/CMakeLists.linux.txt
+++ b/library/cpp/dbg_output/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/dbg_output/CMakeLists.txt b/library/cpp/dbg_output/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/dbg_output/CMakeLists.txt
+++ b/library/cpp/dbg_output/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/accessors/CMakeLists.darwin.txt b/library/cpp/deprecated/accessors/CMakeLists.darwin-x86_64.txt
index 62226eb559..62226eb559 100644
--- a/library/cpp/deprecated/accessors/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/accessors/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/accessors/CMakeLists.linux.txt b/library/cpp/deprecated/accessors/CMakeLists.linux-x86_64.txt
index 0d8a3a9ed2..0d8a3a9ed2 100644
--- a/library/cpp/deprecated/accessors/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/accessors/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/accessors/CMakeLists.txt b/library/cpp/deprecated/accessors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/deprecated/accessors/CMakeLists.txt
+++ b/library/cpp/deprecated/accessors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/atomic/CMakeLists.darwin.txt b/library/cpp/deprecated/atomic/CMakeLists.darwin-x86_64.txt
index 411024be15..411024be15 100644
--- a/library/cpp/deprecated/atomic/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/atomic/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/atomic/CMakeLists.linux.txt b/library/cpp/deprecated/atomic/CMakeLists.linux-x86_64.txt
index 29db7b690f..29db7b690f 100644
--- a/library/cpp/deprecated/atomic/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/atomic/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/atomic/CMakeLists.txt b/library/cpp/deprecated/atomic/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/deprecated/atomic/CMakeLists.txt
+++ b/library/cpp/deprecated/atomic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/enum_codegen/CMakeLists.darwin.txt b/library/cpp/deprecated/enum_codegen/CMakeLists.darwin-x86_64.txt
index 3ec6a99b97..3ec6a99b97 100644
--- a/library/cpp/deprecated/enum_codegen/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/enum_codegen/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/enum_codegen/CMakeLists.linux.txt b/library/cpp/deprecated/enum_codegen/CMakeLists.linux-x86_64.txt
index 255bbbe453..255bbbe453 100644
--- a/library/cpp/deprecated/enum_codegen/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/enum_codegen/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/enum_codegen/CMakeLists.txt b/library/cpp/deprecated/enum_codegen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/deprecated/enum_codegen/CMakeLists.txt
+++ b/library/cpp/deprecated/enum_codegen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/kmp/CMakeLists.darwin.txt b/library/cpp/deprecated/kmp/CMakeLists.darwin-x86_64.txt
index 1a8b825dad..1a8b825dad 100644
--- a/library/cpp/deprecated/kmp/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/kmp/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/kmp/CMakeLists.linux.txt b/library/cpp/deprecated/kmp/CMakeLists.linux-x86_64.txt
index ed7a436e3c..ed7a436e3c 100644
--- a/library/cpp/deprecated/kmp/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/kmp/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/kmp/CMakeLists.txt b/library/cpp/deprecated/kmp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/deprecated/kmp/CMakeLists.txt
+++ b/library/cpp/deprecated/kmp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/deprecated/split/CMakeLists.darwin.txt b/library/cpp/deprecated/split/CMakeLists.darwin-x86_64.txt
index d23b1620f7..d23b1620f7 100644
--- a/library/cpp/deprecated/split/CMakeLists.darwin.txt
+++ b/library/cpp/deprecated/split/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/deprecated/split/CMakeLists.linux.txt b/library/cpp/deprecated/split/CMakeLists.linux-x86_64.txt
index 4851ba6aba..4851ba6aba 100644
--- a/library/cpp/deprecated/split/CMakeLists.linux.txt
+++ b/library/cpp/deprecated/split/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/deprecated/split/CMakeLists.txt b/library/cpp/deprecated/split/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/deprecated/split/CMakeLists.txt
+++ b/library/cpp/deprecated/split/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/diff/CMakeLists.darwin.txt b/library/cpp/diff/CMakeLists.darwin-x86_64.txt
index f6c4677907..f6c4677907 100644
--- a/library/cpp/diff/CMakeLists.darwin.txt
+++ b/library/cpp/diff/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/diff/CMakeLists.linux.txt b/library/cpp/diff/CMakeLists.linux-x86_64.txt
index 47ba972f0f..47ba972f0f 100644
--- a/library/cpp/diff/CMakeLists.linux.txt
+++ b/library/cpp/diff/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/diff/CMakeLists.txt b/library/cpp/diff/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/diff/CMakeLists.txt
+++ b/library/cpp/diff/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/CMakeLists.darwin.txt b/library/cpp/digest/argonish/CMakeLists.darwin-x86_64.txt
index 7b132051da..7b132051da 100644
--- a/library/cpp/digest/argonish/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/CMakeLists.linux.txt b/library/cpp/digest/argonish/CMakeLists.linux-x86_64.txt
index 2eafc5fe69..2eafc5fe69 100644
--- a/library/cpp/digest/argonish/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/CMakeLists.txt b/library/cpp/digest/argonish/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/argonish/CMakeLists.txt
+++ b/library/cpp/digest/argonish/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/argon2/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/argon2/CMakeLists.darwin-x86_64.txt
index e2dbc9ace9..e2dbc9ace9 100644
--- a/library/cpp/digest/argonish/internal/argon2/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/argon2/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/argon2/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/argon2/CMakeLists.linux-x86_64.txt
index b0bc4fd1cd..b0bc4fd1cd 100644
--- a/library/cpp/digest/argonish/internal/argon2/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/argon2/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt b/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/argon2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.darwin-x86_64.txt
index 63474af49f..63474af49f 100644
--- a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.linux-x86_64.txt
index 390ba10548..390ba10548 100644
--- a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/blake2b/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/blamka/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/blamka/CMakeLists.darwin-x86_64.txt
index 7e8d1fcb36..7e8d1fcb36 100644
--- a/library/cpp/digest/argonish/internal/blamka/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/blamka/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/blamka/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/blamka/CMakeLists.linux-x86_64.txt
index f6df186ad2..f6df186ad2 100644
--- a/library/cpp/digest/argonish/internal/blamka/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/blamka/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt b/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/blamka/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/CMakeLists.darwin-x86_64.txt
index e34d1b9065..e34d1b9065 100644
--- a/library/cpp/digest/argonish/internal/proxies/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/CMakeLists.linux-x86_64.txt
index e34d1b9065..e34d1b9065 100644
--- a/library/cpp/digest/argonish/internal/proxies/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.darwin-x86_64.txt
index 6242e299b8..6242e299b8 100644
--- a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.linux-x86_64.txt
index 1f954bb636..1f954bb636 100644
--- a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.darwin-x86_64.txt
index bb153d887a..bb153d887a 100644
--- a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.linux-x86_64.txt
index a5caf518c9..a5caf518c9 100644
--- a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/macro/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.darwin-x86_64.txt
index f4ed53513c..f4ed53513c 100644
--- a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.linux-x86_64.txt
index 0f6d317b77..0f6d317b77 100644
--- a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ref/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.darwin-x86_64.txt
index 7b57a5e09b..7b57a5e09b 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.linux-x86_64.txt
index 3c12d16117..3c12d16117 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.darwin-x86_64.txt
index 48f772826d..48f772826d 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.linux-x86_64.txt
index 602f000ee5..602f000ee5 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.darwin-x86_64.txt
index 8c1d2591ed..8c1d2591ed 100644
--- a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.linux-x86_64.txt
index b70cc4d942..b70cc4d942 100644
--- a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/argonish/internal/rotations/CMakeLists.darwin.txt b/library/cpp/digest/argonish/internal/rotations/CMakeLists.darwin-x86_64.txt
index b4468ed351..b4468ed351 100644
--- a/library/cpp/digest/argonish/internal/rotations/CMakeLists.darwin.txt
+++ b/library/cpp/digest/argonish/internal/rotations/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/rotations/CMakeLists.linux.txt b/library/cpp/digest/argonish/internal/rotations/CMakeLists.linux-x86_64.txt
index 1ef3f3119d..1ef3f3119d 100644
--- a/library/cpp/digest/argonish/internal/rotations/CMakeLists.linux.txt
+++ b/library/cpp/digest/argonish/internal/rotations/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt b/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/rotations/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/crc32c/CMakeLists.darwin.txt b/library/cpp/digest/crc32c/CMakeLists.darwin-x86_64.txt
index 295652eae0..295652eae0 100644
--- a/library/cpp/digest/crc32c/CMakeLists.darwin.txt
+++ b/library/cpp/digest/crc32c/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/crc32c/CMakeLists.linux.txt b/library/cpp/digest/crc32c/CMakeLists.linux-x86_64.txt
index 8d93b2e289..8d93b2e289 100644
--- a/library/cpp/digest/crc32c/CMakeLists.linux.txt
+++ b/library/cpp/digest/crc32c/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/crc32c/CMakeLists.txt b/library/cpp/digest/crc32c/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/crc32c/CMakeLists.txt
+++ b/library/cpp/digest/crc32c/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/lower_case/CMakeLists.darwin.txt b/library/cpp/digest/lower_case/CMakeLists.darwin-x86_64.txt
index 5ab4c75fd0..5ab4c75fd0 100644
--- a/library/cpp/digest/lower_case/CMakeLists.darwin.txt
+++ b/library/cpp/digest/lower_case/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/lower_case/CMakeLists.linux.txt b/library/cpp/digest/lower_case/CMakeLists.linux-x86_64.txt
index f4bbc65bf6..f4bbc65bf6 100644
--- a/library/cpp/digest/lower_case/CMakeLists.linux.txt
+++ b/library/cpp/digest/lower_case/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/lower_case/CMakeLists.txt b/library/cpp/digest/lower_case/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/lower_case/CMakeLists.txt
+++ b/library/cpp/digest/lower_case/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/md5/CMakeLists.darwin.txt b/library/cpp/digest/md5/CMakeLists.darwin-x86_64.txt
index bbf3a1fc1e..bbf3a1fc1e 100644
--- a/library/cpp/digest/md5/CMakeLists.darwin.txt
+++ b/library/cpp/digest/md5/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/md5/CMakeLists.linux.txt b/library/cpp/digest/md5/CMakeLists.linux-x86_64.txt
index 86eead7bfa..86eead7bfa 100644
--- a/library/cpp/digest/md5/CMakeLists.linux.txt
+++ b/library/cpp/digest/md5/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/md5/CMakeLists.txt b/library/cpp/digest/md5/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/md5/CMakeLists.txt
+++ b/library/cpp/digest/md5/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/murmur/CMakeLists.darwin.txt b/library/cpp/digest/murmur/CMakeLists.darwin-x86_64.txt
index ac2e722ed8..ac2e722ed8 100644
--- a/library/cpp/digest/murmur/CMakeLists.darwin.txt
+++ b/library/cpp/digest/murmur/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/murmur/CMakeLists.linux.txt b/library/cpp/digest/murmur/CMakeLists.linux-x86_64.txt
index 71c5ec831d..71c5ec831d 100644
--- a/library/cpp/digest/murmur/CMakeLists.linux.txt
+++ b/library/cpp/digest/murmur/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/murmur/CMakeLists.txt b/library/cpp/digest/murmur/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/murmur/CMakeLists.txt
+++ b/library/cpp/digest/murmur/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/old_crc/CMakeLists.darwin.txt b/library/cpp/digest/old_crc/CMakeLists.darwin-x86_64.txt
index a4caa8c756..a4caa8c756 100644
--- a/library/cpp/digest/old_crc/CMakeLists.darwin.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/old_crc/CMakeLists.linux.txt b/library/cpp/digest/old_crc/CMakeLists.linux-x86_64.txt
index a0883b65f5..a0883b65f5 100644
--- a/library/cpp/digest/old_crc/CMakeLists.linux.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/old_crc/CMakeLists.txt b/library/cpp/digest/old_crc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/old_crc/CMakeLists.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin-x86_64.txt
index 8449364983..8449364983 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.linux.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-x86_64.txt
index ed861d121c..ed861d121c 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.linux.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/digest/sfh/CMakeLists.darwin.txt b/library/cpp/digest/sfh/CMakeLists.darwin-x86_64.txt
index 53ca09e84e..53ca09e84e 100644
--- a/library/cpp/digest/sfh/CMakeLists.darwin.txt
+++ b/library/cpp/digest/sfh/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/digest/sfh/CMakeLists.linux.txt b/library/cpp/digest/sfh/CMakeLists.linux-x86_64.txt
index 833aa8c016..833aa8c016 100644
--- a/library/cpp/digest/sfh/CMakeLists.linux.txt
+++ b/library/cpp/digest/sfh/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/digest/sfh/CMakeLists.txt b/library/cpp/digest/sfh/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/digest/sfh/CMakeLists.txt
+++ b/library/cpp/digest/sfh/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/dns/CMakeLists.darwin.txt b/library/cpp/dns/CMakeLists.darwin-x86_64.txt
index c91919f085..c91919f085 100644
--- a/library/cpp/dns/CMakeLists.darwin.txt
+++ b/library/cpp/dns/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/dns/CMakeLists.linux.txt b/library/cpp/dns/CMakeLists.linux-x86_64.txt
index e2f9b3b08a..e2f9b3b08a 100644
--- a/library/cpp/dns/CMakeLists.linux.txt
+++ b/library/cpp/dns/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/dns/CMakeLists.txt b/library/cpp/dns/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/dns/CMakeLists.txt
+++ b/library/cpp/dns/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/enumbitset/CMakeLists.darwin.txt b/library/cpp/enumbitset/CMakeLists.darwin-x86_64.txt
index ff3bed8f5b..ff3bed8f5b 100644
--- a/library/cpp/enumbitset/CMakeLists.darwin.txt
+++ b/library/cpp/enumbitset/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/enumbitset/CMakeLists.linux.txt b/library/cpp/enumbitset/CMakeLists.linux-x86_64.txt
index 29fb5e0956..29fb5e0956 100644
--- a/library/cpp/enumbitset/CMakeLists.linux.txt
+++ b/library/cpp/enumbitset/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/enumbitset/CMakeLists.txt b/library/cpp/enumbitset/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/enumbitset/CMakeLists.txt
+++ b/library/cpp/enumbitset/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/execprofile/CMakeLists.darwin.txt b/library/cpp/execprofile/CMakeLists.darwin-x86_64.txt
index ec649dc8ad..ec649dc8ad 100644
--- a/library/cpp/execprofile/CMakeLists.darwin.txt
+++ b/library/cpp/execprofile/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/execprofile/CMakeLists.linux.txt b/library/cpp/execprofile/CMakeLists.linux-x86_64.txt
index 208b93382b..208b93382b 100644
--- a/library/cpp/execprofile/CMakeLists.linux.txt
+++ b/library/cpp/execprofile/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/execprofile/CMakeLists.txt b/library/cpp/execprofile/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/execprofile/CMakeLists.txt
+++ b/library/cpp/execprofile/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/getopt/CMakeLists.darwin.txt b/library/cpp/getopt/CMakeLists.darwin-x86_64.txt
index 96041aa7d2..96041aa7d2 100644
--- a/library/cpp/getopt/CMakeLists.darwin.txt
+++ b/library/cpp/getopt/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/getopt/CMakeLists.linux.txt b/library/cpp/getopt/CMakeLists.linux-x86_64.txt
index 7b7157919a..7b7157919a 100644
--- a/library/cpp/getopt/CMakeLists.linux.txt
+++ b/library/cpp/getopt/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/getopt/CMakeLists.txt b/library/cpp/getopt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/getopt/CMakeLists.txt
+++ b/library/cpp/getopt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/getopt/small/CMakeLists.darwin.txt b/library/cpp/getopt/small/CMakeLists.darwin-x86_64.txt
index 04c5b67dda..04c5b67dda 100644
--- a/library/cpp/getopt/small/CMakeLists.darwin.txt
+++ b/library/cpp/getopt/small/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/getopt/small/CMakeLists.linux.txt b/library/cpp/getopt/small/CMakeLists.linux-x86_64.txt
index 5aabced8a3..5aabced8a3 100644
--- a/library/cpp/getopt/small/CMakeLists.linux.txt
+++ b/library/cpp/getopt/small/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/getopt/small/CMakeLists.txt b/library/cpp/getopt/small/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/getopt/small/CMakeLists.txt
+++ b/library/cpp/getopt/small/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/grpc/client/CMakeLists.darwin.txt b/library/cpp/grpc/client/CMakeLists.darwin-x86_64.txt
index db6f6bfdc1..db6f6bfdc1 100644
--- a/library/cpp/grpc/client/CMakeLists.darwin.txt
+++ b/library/cpp/grpc/client/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/grpc/client/CMakeLists.linux.txt b/library/cpp/grpc/client/CMakeLists.linux-x86_64.txt
index 80f660d62e..80f660d62e 100644
--- a/library/cpp/grpc/client/CMakeLists.linux.txt
+++ b/library/cpp/grpc/client/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/grpc/client/CMakeLists.txt b/library/cpp/grpc/client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/grpc/client/CMakeLists.txt
+++ b/library/cpp/grpc/client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/grpc/server/CMakeLists.darwin.txt b/library/cpp/grpc/server/CMakeLists.darwin-x86_64.txt
index 1db6667068..1db6667068 100644
--- a/library/cpp/grpc/server/CMakeLists.darwin.txt
+++ b/library/cpp/grpc/server/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/grpc/server/CMakeLists.linux.txt b/library/cpp/grpc/server/CMakeLists.linux-x86_64.txt
index afeac13dc1..afeac13dc1 100644
--- a/library/cpp/grpc/server/CMakeLists.linux.txt
+++ b/library/cpp/grpc/server/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/grpc/server/CMakeLists.txt b/library/cpp/grpc/server/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/grpc/server/CMakeLists.txt
+++ b/library/cpp/grpc/server/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/grpc/server/actors/CMakeLists.darwin.txt b/library/cpp/grpc/server/actors/CMakeLists.darwin-x86_64.txt
index 1e710ad49a..1e710ad49a 100644
--- a/library/cpp/grpc/server/actors/CMakeLists.darwin.txt
+++ b/library/cpp/grpc/server/actors/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/grpc/server/actors/CMakeLists.linux.txt b/library/cpp/grpc/server/actors/CMakeLists.linux-x86_64.txt
index 0d8763b93d..0d8763b93d 100644
--- a/library/cpp/grpc/server/actors/CMakeLists.linux.txt
+++ b/library/cpp/grpc/server/actors/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/grpc/server/actors/CMakeLists.txt b/library/cpp/grpc/server/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/grpc/server/actors/CMakeLists.txt
+++ b/library/cpp/grpc/server/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/histogram/adaptive/CMakeLists.darwin.txt b/library/cpp/histogram/adaptive/CMakeLists.darwin-x86_64.txt
index 82fb24cb78..82fb24cb78 100644
--- a/library/cpp/histogram/adaptive/CMakeLists.darwin.txt
+++ b/library/cpp/histogram/adaptive/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/histogram/adaptive/CMakeLists.linux.txt b/library/cpp/histogram/adaptive/CMakeLists.linux-x86_64.txt
index 089ec72973..089ec72973 100644
--- a/library/cpp/histogram/adaptive/CMakeLists.linux.txt
+++ b/library/cpp/histogram/adaptive/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/histogram/adaptive/CMakeLists.txt b/library/cpp/histogram/adaptive/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/histogram/adaptive/CMakeLists.txt
+++ b/library/cpp/histogram/adaptive/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/histogram/adaptive/protos/CMakeLists.darwin.txt b/library/cpp/histogram/adaptive/protos/CMakeLists.darwin-x86_64.txt
index ff0b6ce0f9..ff0b6ce0f9 100644
--- a/library/cpp/histogram/adaptive/protos/CMakeLists.darwin.txt
+++ b/library/cpp/histogram/adaptive/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/histogram/adaptive/protos/CMakeLists.linux.txt b/library/cpp/histogram/adaptive/protos/CMakeLists.linux-x86_64.txt
index c2746fae77..c2746fae77 100644
--- a/library/cpp/histogram/adaptive/protos/CMakeLists.linux.txt
+++ b/library/cpp/histogram/adaptive/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/histogram/adaptive/protos/CMakeLists.txt b/library/cpp/histogram/adaptive/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/histogram/adaptive/protos/CMakeLists.txt
+++ b/library/cpp/histogram/adaptive/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/histogram/hdr/CMakeLists.darwin.txt b/library/cpp/histogram/hdr/CMakeLists.darwin-x86_64.txt
index cf961268fa..cf961268fa 100644
--- a/library/cpp/histogram/hdr/CMakeLists.darwin.txt
+++ b/library/cpp/histogram/hdr/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/histogram/hdr/CMakeLists.linux.txt b/library/cpp/histogram/hdr/CMakeLists.linux-x86_64.txt
index 66b62a62a9..66b62a62a9 100644
--- a/library/cpp/histogram/hdr/CMakeLists.linux.txt
+++ b/library/cpp/histogram/hdr/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/histogram/hdr/CMakeLists.txt b/library/cpp/histogram/hdr/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/histogram/hdr/CMakeLists.txt
+++ b/library/cpp/histogram/hdr/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/html/escape/CMakeLists.darwin.txt b/library/cpp/html/escape/CMakeLists.darwin-x86_64.txt
index 890dac1539..890dac1539 100644
--- a/library/cpp/html/escape/CMakeLists.darwin.txt
+++ b/library/cpp/html/escape/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/html/escape/CMakeLists.linux.txt b/library/cpp/html/escape/CMakeLists.linux-x86_64.txt
index 1a4747c4e3..1a4747c4e3 100644
--- a/library/cpp/html/escape/CMakeLists.linux.txt
+++ b/library/cpp/html/escape/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/html/escape/CMakeLists.txt b/library/cpp/html/escape/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/html/escape/CMakeLists.txt
+++ b/library/cpp/html/escape/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/html/pcdata/CMakeLists.darwin.txt b/library/cpp/html/pcdata/CMakeLists.darwin-x86_64.txt
index 0efffd69e0..0efffd69e0 100644
--- a/library/cpp/html/pcdata/CMakeLists.darwin.txt
+++ b/library/cpp/html/pcdata/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/html/pcdata/CMakeLists.linux.txt b/library/cpp/html/pcdata/CMakeLists.linux-x86_64.txt
index c6a073acaf..c6a073acaf 100644
--- a/library/cpp/html/pcdata/CMakeLists.linux.txt
+++ b/library/cpp/html/pcdata/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/html/pcdata/CMakeLists.txt b/library/cpp/html/pcdata/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/html/pcdata/CMakeLists.txt
+++ b/library/cpp/html/pcdata/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/fetch/CMakeLists.darwin.txt b/library/cpp/http/fetch/CMakeLists.darwin-x86_64.txt
index b507fb8c2e..b507fb8c2e 100644
--- a/library/cpp/http/fetch/CMakeLists.darwin.txt
+++ b/library/cpp/http/fetch/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/fetch/CMakeLists.linux.txt b/library/cpp/http/fetch/CMakeLists.linux-x86_64.txt
index 432831775a..432831775a 100644
--- a/library/cpp/http/fetch/CMakeLists.linux.txt
+++ b/library/cpp/http/fetch/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/fetch/CMakeLists.txt b/library/cpp/http/fetch/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/http/fetch/CMakeLists.txt
+++ b/library/cpp/http/fetch/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/io/CMakeLists.darwin.txt b/library/cpp/http/io/CMakeLists.darwin-x86_64.txt
index 1f1eab359c..1f1eab359c 100644
--- a/library/cpp/http/io/CMakeLists.darwin.txt
+++ b/library/cpp/http/io/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/io/CMakeLists.linux.txt b/library/cpp/http/io/CMakeLists.linux-x86_64.txt
index fb6cf45467..fb6cf45467 100644
--- a/library/cpp/http/io/CMakeLists.linux.txt
+++ b/library/cpp/http/io/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/io/CMakeLists.txt b/library/cpp/http/io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/http/io/CMakeLists.txt
+++ b/library/cpp/http/io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/misc/CMakeLists.darwin.txt b/library/cpp/http/misc/CMakeLists.darwin-x86_64.txt
index c909854a9a..c909854a9a 100644
--- a/library/cpp/http/misc/CMakeLists.darwin.txt
+++ b/library/cpp/http/misc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/misc/CMakeLists.linux.txt b/library/cpp/http/misc/CMakeLists.linux-x86_64.txt
index 026af90992..026af90992 100644
--- a/library/cpp/http/misc/CMakeLists.linux.txt
+++ b/library/cpp/http/misc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/misc/CMakeLists.txt b/library/cpp/http/misc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/http/misc/CMakeLists.txt
+++ b/library/cpp/http/misc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/server/CMakeLists.darwin.txt b/library/cpp/http/server/CMakeLists.darwin-x86_64.txt
index 9d8b2182ba..9d8b2182ba 100644
--- a/library/cpp/http/server/CMakeLists.darwin.txt
+++ b/library/cpp/http/server/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/server/CMakeLists.linux.txt b/library/cpp/http/server/CMakeLists.linux-x86_64.txt
index be781cf25a..be781cf25a 100644
--- a/library/cpp/http/server/CMakeLists.linux.txt
+++ b/library/cpp/http/server/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/server/CMakeLists.txt b/library/cpp/http/server/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/http/server/CMakeLists.txt
+++ b/library/cpp/http/server/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/http/simple/CMakeLists.darwin.txt b/library/cpp/http/simple/CMakeLists.darwin-x86_64.txt
index 68c2fb64a3..68c2fb64a3 100644
--- a/library/cpp/http/simple/CMakeLists.darwin.txt
+++ b/library/cpp/http/simple/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/http/simple/CMakeLists.linux.txt b/library/cpp/http/simple/CMakeLists.linux-x86_64.txt
index 970d858e0e..970d858e0e 100644
--- a/library/cpp/http/simple/CMakeLists.linux.txt
+++ b/library/cpp/http/simple/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/http/simple/CMakeLists.txt b/library/cpp/http/simple/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/http/simple/CMakeLists.txt
+++ b/library/cpp/http/simple/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/hyperloglog/CMakeLists.darwin.txt b/library/cpp/hyperloglog/CMakeLists.darwin-x86_64.txt
index 5a180602bc..5a180602bc 100644
--- a/library/cpp/hyperloglog/CMakeLists.darwin.txt
+++ b/library/cpp/hyperloglog/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/hyperloglog/CMakeLists.linux.txt b/library/cpp/hyperloglog/CMakeLists.linux-x86_64.txt
index bbbb9103f6..bbbb9103f6 100644
--- a/library/cpp/hyperloglog/CMakeLists.linux.txt
+++ b/library/cpp/hyperloglog/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/hyperloglog/CMakeLists.txt b/library/cpp/hyperloglog/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/hyperloglog/CMakeLists.txt
+++ b/library/cpp/hyperloglog/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/int128/CMakeLists.darwin.txt b/library/cpp/int128/CMakeLists.darwin-x86_64.txt
index cdc5d289ee..cdc5d289ee 100644
--- a/library/cpp/int128/CMakeLists.darwin.txt
+++ b/library/cpp/int128/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/int128/CMakeLists.linux.txt b/library/cpp/int128/CMakeLists.linux-x86_64.txt
index 504a4558f7..504a4558f7 100644
--- a/library/cpp/int128/CMakeLists.linux.txt
+++ b/library/cpp/int128/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/int128/CMakeLists.txt b/library/cpp/int128/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/int128/CMakeLists.txt
+++ b/library/cpp/int128/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/ipmath/CMakeLists.darwin.txt b/library/cpp/ipmath/CMakeLists.darwin-x86_64.txt
index 78a4d06b4b..78a4d06b4b 100644
--- a/library/cpp/ipmath/CMakeLists.darwin.txt
+++ b/library/cpp/ipmath/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/ipmath/CMakeLists.linux.txt b/library/cpp/ipmath/CMakeLists.linux-x86_64.txt
index 65648f12ee..65648f12ee 100644
--- a/library/cpp/ipmath/CMakeLists.linux.txt
+++ b/library/cpp/ipmath/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/ipmath/CMakeLists.txt b/library/cpp/ipmath/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/ipmath/CMakeLists.txt
+++ b/library/cpp/ipmath/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/ipv6_address/CMakeLists.darwin.txt b/library/cpp/ipv6_address/CMakeLists.darwin-x86_64.txt
index 6156f5cbe2..6156f5cbe2 100644
--- a/library/cpp/ipv6_address/CMakeLists.darwin.txt
+++ b/library/cpp/ipv6_address/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/ipv6_address/CMakeLists.linux.txt b/library/cpp/ipv6_address/CMakeLists.linux-x86_64.txt
index 478d0655cf..478d0655cf 100644
--- a/library/cpp/ipv6_address/CMakeLists.linux.txt
+++ b/library/cpp/ipv6_address/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/ipv6_address/CMakeLists.txt b/library/cpp/ipv6_address/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/ipv6_address/CMakeLists.txt
+++ b/library/cpp/ipv6_address/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/iterator/CMakeLists.darwin.txt b/library/cpp/iterator/CMakeLists.darwin-x86_64.txt
index ee33c74cea..ee33c74cea 100644
--- a/library/cpp/iterator/CMakeLists.darwin.txt
+++ b/library/cpp/iterator/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/iterator/CMakeLists.linux.txt b/library/cpp/iterator/CMakeLists.linux-x86_64.txt
index 5fb04be066..5fb04be066 100644
--- a/library/cpp/iterator/CMakeLists.linux.txt
+++ b/library/cpp/iterator/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/iterator/CMakeLists.txt b/library/cpp/iterator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/iterator/CMakeLists.txt
+++ b/library/cpp/iterator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/CMakeLists.darwin.txt b/library/cpp/json/CMakeLists.darwin-x86_64.txt
index bbf8222242..bbf8222242 100644
--- a/library/cpp/json/CMakeLists.darwin.txt
+++ b/library/cpp/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/CMakeLists.linux.txt b/library/cpp/json/CMakeLists.linux-x86_64.txt
index d55c7d2c3b..d55c7d2c3b 100644
--- a/library/cpp/json/CMakeLists.linux.txt
+++ b/library/cpp/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/CMakeLists.txt b/library/cpp/json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/json/CMakeLists.txt
+++ b/library/cpp/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/common/CMakeLists.darwin.txt b/library/cpp/json/common/CMakeLists.darwin-x86_64.txt
index 3fc903e74d..3fc903e74d 100644
--- a/library/cpp/json/common/CMakeLists.darwin.txt
+++ b/library/cpp/json/common/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/common/CMakeLists.linux.txt b/library/cpp/json/common/CMakeLists.linux-x86_64.txt
index e957a68917..e957a68917 100644
--- a/library/cpp/json/common/CMakeLists.linux.txt
+++ b/library/cpp/json/common/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/common/CMakeLists.txt b/library/cpp/json/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/json/common/CMakeLists.txt
+++ b/library/cpp/json/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/easy_parse/CMakeLists.darwin.txt b/library/cpp/json/easy_parse/CMakeLists.darwin-x86_64.txt
index 18daf19913..18daf19913 100644
--- a/library/cpp/json/easy_parse/CMakeLists.darwin.txt
+++ b/library/cpp/json/easy_parse/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/easy_parse/CMakeLists.linux.txt b/library/cpp/json/easy_parse/CMakeLists.linux-x86_64.txt
index 604119958d..604119958d 100644
--- a/library/cpp/json/easy_parse/CMakeLists.linux.txt
+++ b/library/cpp/json/easy_parse/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/easy_parse/CMakeLists.txt b/library/cpp/json/easy_parse/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/json/easy_parse/CMakeLists.txt
+++ b/library/cpp/json/easy_parse/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/fast_sax/CMakeLists.darwin.txt b/library/cpp/json/fast_sax/CMakeLists.darwin-x86_64.txt
index 441d602ca7..441d602ca7 100644
--- a/library/cpp/json/fast_sax/CMakeLists.darwin.txt
+++ b/library/cpp/json/fast_sax/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/fast_sax/CMakeLists.linux.txt b/library/cpp/json/fast_sax/CMakeLists.linux-x86_64.txt
index 5a75c7a88f..5a75c7a88f 100644
--- a/library/cpp/json/fast_sax/CMakeLists.linux.txt
+++ b/library/cpp/json/fast_sax/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/fast_sax/CMakeLists.txt b/library/cpp/json/fast_sax/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/json/fast_sax/CMakeLists.txt
+++ b/library/cpp/json/fast_sax/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/writer/CMakeLists.darwin.txt b/library/cpp/json/writer/CMakeLists.darwin-x86_64.txt
index e164da14c0..e164da14c0 100644
--- a/library/cpp/json/writer/CMakeLists.darwin.txt
+++ b/library/cpp/json/writer/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/writer/CMakeLists.linux.txt b/library/cpp/json/writer/CMakeLists.linux-x86_64.txt
index 7793777f86..7793777f86 100644
--- a/library/cpp/json/writer/CMakeLists.linux.txt
+++ b/library/cpp/json/writer/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/writer/CMakeLists.txt b/library/cpp/json/writer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/json/writer/CMakeLists.txt
+++ b/library/cpp/json/writer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/json/yson/CMakeLists.darwin.txt b/library/cpp/json/yson/CMakeLists.darwin-x86_64.txt
index 9f16a5a41e..9f16a5a41e 100644
--- a/library/cpp/json/yson/CMakeLists.darwin.txt
+++ b/library/cpp/json/yson/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/json/yson/CMakeLists.linux.txt b/library/cpp/json/yson/CMakeLists.linux-x86_64.txt
index b34d62f0e9..b34d62f0e9 100644
--- a/library/cpp/json/yson/CMakeLists.linux.txt
+++ b/library/cpp/json/yson/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/json/yson/CMakeLists.txt b/library/cpp/json/yson/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/json/yson/CMakeLists.txt
+++ b/library/cpp/json/yson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lcs/CMakeLists.darwin.txt b/library/cpp/lcs/CMakeLists.darwin-x86_64.txt
index 52cb38d674..52cb38d674 100644
--- a/library/cpp/lcs/CMakeLists.darwin.txt
+++ b/library/cpp/lcs/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lcs/CMakeLists.linux.txt b/library/cpp/lcs/CMakeLists.linux-x86_64.txt
index 6c570438f2..6c570438f2 100644
--- a/library/cpp/lcs/CMakeLists.linux.txt
+++ b/library/cpp/lcs/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lcs/CMakeLists.txt b/library/cpp/lcs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lcs/CMakeLists.txt
+++ b/library/cpp/lcs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lfalloc/CMakeLists.darwin.txt b/library/cpp/lfalloc/CMakeLists.darwin-x86_64.txt
index c5ee648844..c5ee648844 100644
--- a/library/cpp/lfalloc/CMakeLists.darwin.txt
+++ b/library/cpp/lfalloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lfalloc/CMakeLists.linux.txt b/library/cpp/lfalloc/CMakeLists.linux-x86_64.txt
index de6f97ec6a..de6f97ec6a 100644
--- a/library/cpp/lfalloc/CMakeLists.linux.txt
+++ b/library/cpp/lfalloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lfalloc/CMakeLists.txt b/library/cpp/lfalloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lfalloc/CMakeLists.txt
+++ b/library/cpp/lfalloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lfalloc/alloc_profiler/CMakeLists.darwin.txt b/library/cpp/lfalloc/alloc_profiler/CMakeLists.darwin-x86_64.txt
index b94d19ad32..b94d19ad32 100644
--- a/library/cpp/lfalloc/alloc_profiler/CMakeLists.darwin.txt
+++ b/library/cpp/lfalloc/alloc_profiler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lfalloc/alloc_profiler/CMakeLists.linux.txt b/library/cpp/lfalloc/alloc_profiler/CMakeLists.linux-x86_64.txt
index d215bfaccc..d215bfaccc 100644
--- a/library/cpp/lfalloc/alloc_profiler/CMakeLists.linux.txt
+++ b/library/cpp/lfalloc/alloc_profiler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lfalloc/alloc_profiler/CMakeLists.txt b/library/cpp/lfalloc/alloc_profiler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lfalloc/alloc_profiler/CMakeLists.txt
+++ b/library/cpp/lfalloc/alloc_profiler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lfalloc/dbg_info/CMakeLists.darwin.txt b/library/cpp/lfalloc/dbg_info/CMakeLists.darwin-x86_64.txt
index ec8b8ba23b..ec8b8ba23b 100644
--- a/library/cpp/lfalloc/dbg_info/CMakeLists.darwin.txt
+++ b/library/cpp/lfalloc/dbg_info/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lfalloc/dbg_info/CMakeLists.linux.txt b/library/cpp/lfalloc/dbg_info/CMakeLists.linux-x86_64.txt
index 05ee5297ba..05ee5297ba 100644
--- a/library/cpp/lfalloc/dbg_info/CMakeLists.linux.txt
+++ b/library/cpp/lfalloc/dbg_info/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lfalloc/dbg_info/CMakeLists.txt b/library/cpp/lfalloc/dbg_info/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lfalloc/dbg_info/CMakeLists.txt
+++ b/library/cpp/lfalloc/dbg_info/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lfalloc/yt/CMakeLists.darwin.txt b/library/cpp/lfalloc/yt/CMakeLists.darwin-x86_64.txt
index ab5c2e2e91..ab5c2e2e91 100644
--- a/library/cpp/lfalloc/yt/CMakeLists.darwin.txt
+++ b/library/cpp/lfalloc/yt/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lfalloc/yt/CMakeLists.txt b/library/cpp/lfalloc/yt/CMakeLists.txt
index 270d5d94da..5bedd04e09 100644
--- a/library/cpp/lfalloc/yt/CMakeLists.txt
+++ b/library/cpp/lfalloc/yt/CMakeLists.txt
@@ -7,5 +7,5 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 endif()
diff --git a/library/cpp/linear_regression/CMakeLists.darwin.txt b/library/cpp/linear_regression/CMakeLists.darwin-x86_64.txt
index db574777d6..db574777d6 100644
--- a/library/cpp/linear_regression/CMakeLists.darwin.txt
+++ b/library/cpp/linear_regression/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/linear_regression/CMakeLists.linux.txt b/library/cpp/linear_regression/CMakeLists.linux-x86_64.txt
index 154199c952..154199c952 100644
--- a/library/cpp/linear_regression/CMakeLists.linux.txt
+++ b/library/cpp/linear_regression/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/linear_regression/CMakeLists.txt b/library/cpp/linear_regression/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/linear_regression/CMakeLists.txt
+++ b/library/cpp/linear_regression/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/logger/CMakeLists.darwin.txt b/library/cpp/logger/CMakeLists.darwin-x86_64.txt
index 92cf5b5d93..92cf5b5d93 100644
--- a/library/cpp/logger/CMakeLists.darwin.txt
+++ b/library/cpp/logger/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/logger/CMakeLists.linux.txt b/library/cpp/logger/CMakeLists.linux-x86_64.txt
index 7656dd6861..7656dd6861 100644
--- a/library/cpp/logger/CMakeLists.linux.txt
+++ b/library/cpp/logger/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/logger/CMakeLists.txt b/library/cpp/logger/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/logger/CMakeLists.txt
+++ b/library/cpp/logger/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/logger/global/CMakeLists.darwin.txt b/library/cpp/logger/global/CMakeLists.darwin-x86_64.txt
index 4056287548..4056287548 100644
--- a/library/cpp/logger/global/CMakeLists.darwin.txt
+++ b/library/cpp/logger/global/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/logger/global/CMakeLists.linux.txt b/library/cpp/logger/global/CMakeLists.linux-x86_64.txt
index 708e01ed3a..708e01ed3a 100644
--- a/library/cpp/logger/global/CMakeLists.linux.txt
+++ b/library/cpp/logger/global/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/logger/global/CMakeLists.txt b/library/cpp/logger/global/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/logger/global/CMakeLists.txt
+++ b/library/cpp/logger/global/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lua/CMakeLists.darwin.txt b/library/cpp/lua/CMakeLists.darwin-x86_64.txt
index 7dc3bec75b..7dc3bec75b 100644
--- a/library/cpp/lua/CMakeLists.darwin.txt
+++ b/library/cpp/lua/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lua/CMakeLists.linux.txt b/library/cpp/lua/CMakeLists.linux-x86_64.txt
index e32791dfac..e32791dfac 100644
--- a/library/cpp/lua/CMakeLists.linux.txt
+++ b/library/cpp/lua/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lua/CMakeLists.txt b/library/cpp/lua/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lua/CMakeLists.txt
+++ b/library/cpp/lua/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lwtrace/CMakeLists.darwin.txt b/library/cpp/lwtrace/CMakeLists.darwin-x86_64.txt
index 370dbb17fd..370dbb17fd 100644
--- a/library/cpp/lwtrace/CMakeLists.darwin.txt
+++ b/library/cpp/lwtrace/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lwtrace/CMakeLists.linux.txt b/library/cpp/lwtrace/CMakeLists.linux-x86_64.txt
index c16204ed5a..c16204ed5a 100644
--- a/library/cpp/lwtrace/CMakeLists.linux.txt
+++ b/library/cpp/lwtrace/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lwtrace/CMakeLists.txt b/library/cpp/lwtrace/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lwtrace/CMakeLists.txt
+++ b/library/cpp/lwtrace/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lwtrace/mon/CMakeLists.darwin.txt b/library/cpp/lwtrace/mon/CMakeLists.darwin-x86_64.txt
index 84ce12f208..84ce12f208 100644
--- a/library/cpp/lwtrace/mon/CMakeLists.darwin.txt
+++ b/library/cpp/lwtrace/mon/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lwtrace/mon/CMakeLists.linux.txt b/library/cpp/lwtrace/mon/CMakeLists.linux-x86_64.txt
index 7f31cfc6fe..7f31cfc6fe 100644
--- a/library/cpp/lwtrace/mon/CMakeLists.linux.txt
+++ b/library/cpp/lwtrace/mon/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lwtrace/mon/CMakeLists.txt b/library/cpp/lwtrace/mon/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lwtrace/mon/CMakeLists.txt
+++ b/library/cpp/lwtrace/mon/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lwtrace/mon/analytics/CMakeLists.darwin.txt b/library/cpp/lwtrace/mon/analytics/CMakeLists.darwin-x86_64.txt
index f1a03a5f4a..f1a03a5f4a 100644
--- a/library/cpp/lwtrace/mon/analytics/CMakeLists.darwin.txt
+++ b/library/cpp/lwtrace/mon/analytics/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lwtrace/mon/analytics/CMakeLists.linux.txt b/library/cpp/lwtrace/mon/analytics/CMakeLists.linux-x86_64.txt
index 21c332ae9c..21c332ae9c 100644
--- a/library/cpp/lwtrace/mon/analytics/CMakeLists.linux.txt
+++ b/library/cpp/lwtrace/mon/analytics/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lwtrace/mon/analytics/CMakeLists.txt b/library/cpp/lwtrace/mon/analytics/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lwtrace/mon/analytics/CMakeLists.txt
+++ b/library/cpp/lwtrace/mon/analytics/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/lwtrace/protos/CMakeLists.darwin.txt b/library/cpp/lwtrace/protos/CMakeLists.darwin-x86_64.txt
index 9caa6f58bf..9caa6f58bf 100644
--- a/library/cpp/lwtrace/protos/CMakeLists.darwin.txt
+++ b/library/cpp/lwtrace/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/lwtrace/protos/CMakeLists.linux.txt b/library/cpp/lwtrace/protos/CMakeLists.linux-x86_64.txt
index f9321305c1..f9321305c1 100644
--- a/library/cpp/lwtrace/protos/CMakeLists.linux.txt
+++ b/library/cpp/lwtrace/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/lwtrace/protos/CMakeLists.txt b/library/cpp/lwtrace/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/lwtrace/protos/CMakeLists.txt
+++ b/library/cpp/lwtrace/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/CMakeLists.darwin.txt b/library/cpp/malloc/CMakeLists.darwin-x86_64.txt
index 5d8a4de4f7..5d8a4de4f7 100644
--- a/library/cpp/malloc/CMakeLists.darwin.txt
+++ b/library/cpp/malloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/malloc/CMakeLists.linux.txt b/library/cpp/malloc/CMakeLists.linux-x86_64.txt
index 974a53462b..974a53462b 100644
--- a/library/cpp/malloc/CMakeLists.linux.txt
+++ b/library/cpp/malloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/malloc/CMakeLists.txt b/library/cpp/malloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/malloc/CMakeLists.txt
+++ b/library/cpp/malloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/api/CMakeLists.darwin.txt b/library/cpp/malloc/api/CMakeLists.darwin-x86_64.txt
index db837d83de..db837d83de 100644
--- a/library/cpp/malloc/api/CMakeLists.darwin.txt
+++ b/library/cpp/malloc/api/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/malloc/api/CMakeLists.linux.txt b/library/cpp/malloc/api/CMakeLists.linux-x86_64.txt
index 6b81b89d4c..6b81b89d4c 100644
--- a/library/cpp/malloc/api/CMakeLists.linux.txt
+++ b/library/cpp/malloc/api/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/malloc/api/CMakeLists.txt b/library/cpp/malloc/api/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/malloc/api/CMakeLists.txt
+++ b/library/cpp/malloc/api/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/jemalloc/CMakeLists.darwin.txt b/library/cpp/malloc/jemalloc/CMakeLists.darwin-x86_64.txt
index ea1e085b74..ea1e085b74 100644
--- a/library/cpp/malloc/jemalloc/CMakeLists.darwin.txt
+++ b/library/cpp/malloc/jemalloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/malloc/jemalloc/CMakeLists.linux.txt b/library/cpp/malloc/jemalloc/CMakeLists.linux-x86_64.txt
index f4c156bc0c..f4c156bc0c 100644
--- a/library/cpp/malloc/jemalloc/CMakeLists.linux.txt
+++ b/library/cpp/malloc/jemalloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/malloc/jemalloc/CMakeLists.txt b/library/cpp/malloc/jemalloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/malloc/jemalloc/CMakeLists.txt
+++ b/library/cpp/malloc/jemalloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/system/CMakeLists.darwin.txt b/library/cpp/malloc/system/CMakeLists.darwin-x86_64.txt
index 72c039454c..72c039454c 100644
--- a/library/cpp/malloc/system/CMakeLists.darwin.txt
+++ b/library/cpp/malloc/system/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/malloc/system/CMakeLists.txt b/library/cpp/malloc/system/CMakeLists.txt
index 270d5d94da..5bedd04e09 100644
--- a/library/cpp/malloc/system/CMakeLists.txt
+++ b/library/cpp/malloc/system/CMakeLists.txt
@@ -7,5 +7,5 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 endif()
diff --git a/library/cpp/malloc/tcmalloc/CMakeLists.linux.txt b/library/cpp/malloc/tcmalloc/CMakeLists.linux-x86_64.txt
index be15c6c305..be15c6c305 100644
--- a/library/cpp/malloc/tcmalloc/CMakeLists.linux.txt
+++ b/library/cpp/malloc/tcmalloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/malloc/tcmalloc/CMakeLists.txt b/library/cpp/malloc/tcmalloc/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/library/cpp/malloc/tcmalloc/CMakeLists.txt
+++ b/library/cpp/malloc/tcmalloc/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/CMakeLists.darwin.txt b/library/cpp/messagebus/CMakeLists.darwin-x86_64.txt
index af2b7a2008..af2b7a2008 100644
--- a/library/cpp/messagebus/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/CMakeLists.linux.txt b/library/cpp/messagebus/CMakeLists.linux-x86_64.txt
index e27549d923..e27549d923 100644
--- a/library/cpp/messagebus/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/CMakeLists.txt b/library/cpp/messagebus/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/messagebus/CMakeLists.txt
+++ b/library/cpp/messagebus/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/actor/CMakeLists.darwin.txt b/library/cpp/messagebus/actor/CMakeLists.darwin-x86_64.txt
index da26bb12a8..da26bb12a8 100644
--- a/library/cpp/messagebus/actor/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/actor/CMakeLists.linux.txt b/library/cpp/messagebus/actor/CMakeLists.linux-x86_64.txt
index c14195e952..c14195e952 100644
--- a/library/cpp/messagebus/actor/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/actor/CMakeLists.txt b/library/cpp/messagebus/actor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/messagebus/actor/CMakeLists.txt
+++ b/library/cpp/messagebus/actor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/config/CMakeLists.darwin.txt b/library/cpp/messagebus/config/CMakeLists.darwin-x86_64.txt
index 2ac52c60e8..2ac52c60e8 100644
--- a/library/cpp/messagebus/config/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/config/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/config/CMakeLists.linux.txt b/library/cpp/messagebus/config/CMakeLists.linux-x86_64.txt
index 0414cabc63..0414cabc63 100644
--- a/library/cpp/messagebus/config/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/config/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/config/CMakeLists.txt b/library/cpp/messagebus/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/messagebus/config/CMakeLists.txt
+++ b/library/cpp/messagebus/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.darwin.txt b/library/cpp/messagebus/monitoring/CMakeLists.darwin-x86_64.txt
index 0a5f1f8502..0a5f1f8502 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.linux.txt b/library/cpp/messagebus/monitoring/CMakeLists.linux-x86_64.txt
index d7ac9c9c03..d7ac9c9c03 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/monitoring/CMakeLists.txt b/library/cpp/messagebus/monitoring/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/messagebus/monitoring/CMakeLists.txt
+++ b/library/cpp/messagebus/monitoring/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.darwin.txt b/library/cpp/messagebus/oldmodule/CMakeLists.darwin-x86_64.txt
index 11b6ead04d..11b6ead04d 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.linux.txt b/library/cpp/messagebus/oldmodule/CMakeLists.linux-x86_64.txt
index 8e3de5c67f..8e3de5c67f 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/oldmodule/CMakeLists.txt b/library/cpp/messagebus/oldmodule/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/messagebus/oldmodule/CMakeLists.txt
+++ b/library/cpp/messagebus/oldmodule/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.darwin.txt b/library/cpp/messagebus/protobuf/CMakeLists.darwin-x86_64.txt
index 8566a4b7ef..8566a4b7ef 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.linux.txt b/library/cpp/messagebus/protobuf/CMakeLists.linux-x86_64.txt
index e235083392..e235083392 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/protobuf/CMakeLists.txt b/library/cpp/messagebus/protobuf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/messagebus/protobuf/CMakeLists.txt
+++ b/library/cpp/messagebus/protobuf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.darwin.txt b/library/cpp/messagebus/scheduler/CMakeLists.darwin-x86_64.txt
index 510bc01bd5..510bc01bd5 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.linux.txt b/library/cpp/messagebus/scheduler/CMakeLists.linux-x86_64.txt
index 51187c45a4..51187c45a4 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/scheduler/CMakeLists.txt b/library/cpp/messagebus/scheduler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/messagebus/scheduler/CMakeLists.txt
+++ b/library/cpp/messagebus/scheduler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/messagebus/www/CMakeLists.darwin.txt b/library/cpp/messagebus/www/CMakeLists.darwin-x86_64.txt
index 2d41aa3305..2d41aa3305 100644
--- a/library/cpp/messagebus/www/CMakeLists.darwin.txt
+++ b/library/cpp/messagebus/www/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/messagebus/www/CMakeLists.linux.txt b/library/cpp/messagebus/www/CMakeLists.linux-x86_64.txt
index fdc6d5d131..fdc6d5d131 100644
--- a/library/cpp/messagebus/www/CMakeLists.linux.txt
+++ b/library/cpp/messagebus/www/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/messagebus/www/CMakeLists.txt b/library/cpp/messagebus/www/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/messagebus/www/CMakeLists.txt
+++ b/library/cpp/messagebus/www/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/mime/types/CMakeLists.darwin.txt b/library/cpp/mime/types/CMakeLists.darwin-x86_64.txt
index 8e4011a982..8e4011a982 100644
--- a/library/cpp/mime/types/CMakeLists.darwin.txt
+++ b/library/cpp/mime/types/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/mime/types/CMakeLists.linux.txt b/library/cpp/mime/types/CMakeLists.linux-x86_64.txt
index 85364f7595..85364f7595 100644
--- a/library/cpp/mime/types/CMakeLists.linux.txt
+++ b/library/cpp/mime/types/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/mime/types/CMakeLists.txt b/library/cpp/mime/types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/mime/types/CMakeLists.txt
+++ b/library/cpp/mime/types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/deprecated/json/CMakeLists.darwin.txt b/library/cpp/monlib/deprecated/json/CMakeLists.darwin-x86_64.txt
index 6bcb22f8cc..6bcb22f8cc 100644
--- a/library/cpp/monlib/deprecated/json/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/deprecated/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/deprecated/json/CMakeLists.linux.txt b/library/cpp/monlib/deprecated/json/CMakeLists.linux-x86_64.txt
index c7cb3720d3..c7cb3720d3 100644
--- a/library/cpp/monlib/deprecated/json/CMakeLists.linux.txt
+++ b/library/cpp/monlib/deprecated/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/deprecated/json/CMakeLists.txt b/library/cpp/monlib/deprecated/json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/deprecated/json/CMakeLists.txt
+++ b/library/cpp/monlib/deprecated/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.darwin.txt b/library/cpp/monlib/dynamic_counters/CMakeLists.darwin-x86_64.txt
index 35f39a552a..35f39a552a 100644
--- a/library/cpp/monlib/dynamic_counters/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/dynamic_counters/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.linux.txt b/library/cpp/monlib/dynamic_counters/CMakeLists.linux-x86_64.txt
index 79ee1ffe0b..79ee1ffe0b 100644
--- a/library/cpp/monlib/dynamic_counters/CMakeLists.linux.txt
+++ b/library/cpp/monlib/dynamic_counters/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/dynamic_counters/CMakeLists.txt b/library/cpp/monlib/dynamic_counters/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/dynamic_counters/CMakeLists.txt
+++ b/library/cpp/monlib/dynamic_counters/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.darwin.txt b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.darwin-x86_64.txt
index fa99d9dc2f..fa99d9dc2f 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.linux.txt b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.linux-x86_64.txt
index b6a771543e..b6a771543e 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.linux.txt
+++ b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt
+++ b/library/cpp/monlib/dynamic_counters/percentile/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/CMakeLists.darwin.txt b/library/cpp/monlib/encode/CMakeLists.darwin-x86_64.txt
index a74b6d023d..a74b6d023d 100644
--- a/library/cpp/monlib/encode/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/CMakeLists.linux.txt b/library/cpp/monlib/encode/CMakeLists.linux-x86_64.txt
index 6c319f9b68..6c319f9b68 100644
--- a/library/cpp/monlib/encode/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/CMakeLists.txt b/library/cpp/monlib/encode/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/encode/CMakeLists.txt
+++ b/library/cpp/monlib/encode/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/buffered/CMakeLists.darwin.txt b/library/cpp/monlib/encode/buffered/CMakeLists.darwin-x86_64.txt
index e867afbb8c..e867afbb8c 100644
--- a/library/cpp/monlib/encode/buffered/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/buffered/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/buffered/CMakeLists.linux.txt b/library/cpp/monlib/encode/buffered/CMakeLists.linux-x86_64.txt
index 211beb8b27..211beb8b27 100644
--- a/library/cpp/monlib/encode/buffered/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/buffered/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/buffered/CMakeLists.txt b/library/cpp/monlib/encode/buffered/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/encode/buffered/CMakeLists.txt
+++ b/library/cpp/monlib/encode/buffered/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/json/CMakeLists.darwin.txt b/library/cpp/monlib/encode/json/CMakeLists.darwin-x86_64.txt
index 55a0abe1c3..55a0abe1c3 100644
--- a/library/cpp/monlib/encode/json/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/json/CMakeLists.linux.txt b/library/cpp/monlib/encode/json/CMakeLists.linux-x86_64.txt
index 6086064a85..6086064a85 100644
--- a/library/cpp/monlib/encode/json/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/json/CMakeLists.txt b/library/cpp/monlib/encode/json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/encode/json/CMakeLists.txt
+++ b/library/cpp/monlib/encode/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.darwin.txt b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.darwin-x86_64.txt
index bce491e67e..bce491e67e 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.linux.txt b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.linux-x86_64.txt
index a86da32e11..a86da32e11 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
+++ b/library/cpp/monlib/encode/legacy_protobuf/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/prometheus/CMakeLists.darwin.txt b/library/cpp/monlib/encode/prometheus/CMakeLists.darwin-x86_64.txt
index 2db649e693..2db649e693 100644
--- a/library/cpp/monlib/encode/prometheus/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/prometheus/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/prometheus/CMakeLists.linux.txt b/library/cpp/monlib/encode/prometheus/CMakeLists.linux-x86_64.txt
index 7c76369bd9..7c76369bd9 100644
--- a/library/cpp/monlib/encode/prometheus/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/prometheus/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/prometheus/CMakeLists.txt b/library/cpp/monlib/encode/prometheus/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/encode/prometheus/CMakeLists.txt
+++ b/library/cpp/monlib/encode/prometheus/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.darwin.txt b/library/cpp/monlib/encode/spack/CMakeLists.darwin-x86_64.txt
index 9eccd0b629..9eccd0b629 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.linux.txt b/library/cpp/monlib/encode/spack/CMakeLists.linux-x86_64.txt
index 118b926638..118b926638 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.txt b/library/cpp/monlib/encode/spack/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/encode/text/CMakeLists.darwin.txt b/library/cpp/monlib/encode/text/CMakeLists.darwin-x86_64.txt
index 58143a2371..58143a2371 100644
--- a/library/cpp/monlib/encode/text/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/encode/text/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/encode/text/CMakeLists.linux.txt b/library/cpp/monlib/encode/text/CMakeLists.linux-x86_64.txt
index 3089820d80..3089820d80 100644
--- a/library/cpp/monlib/encode/text/CMakeLists.linux.txt
+++ b/library/cpp/monlib/encode/text/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/encode/text/CMakeLists.txt b/library/cpp/monlib/encode/text/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/encode/text/CMakeLists.txt
+++ b/library/cpp/monlib/encode/text/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/exception/CMakeLists.darwin.txt b/library/cpp/monlib/exception/CMakeLists.darwin-x86_64.txt
index 94cb28420f..94cb28420f 100644
--- a/library/cpp/monlib/exception/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/exception/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/exception/CMakeLists.linux.txt b/library/cpp/monlib/exception/CMakeLists.linux-x86_64.txt
index f1bd66c0da..f1bd66c0da 100644
--- a/library/cpp/monlib/exception/CMakeLists.linux.txt
+++ b/library/cpp/monlib/exception/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/exception/CMakeLists.txt b/library/cpp/monlib/exception/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/exception/CMakeLists.txt
+++ b/library/cpp/monlib/exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/messagebus/CMakeLists.darwin.txt b/library/cpp/monlib/messagebus/CMakeLists.darwin-x86_64.txt
index cae48e0a83..cae48e0a83 100644
--- a/library/cpp/monlib/messagebus/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/messagebus/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/messagebus/CMakeLists.linux.txt b/library/cpp/monlib/messagebus/CMakeLists.linux-x86_64.txt
index 98f2b23c77..98f2b23c77 100644
--- a/library/cpp/monlib/messagebus/CMakeLists.linux.txt
+++ b/library/cpp/monlib/messagebus/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/messagebus/CMakeLists.txt b/library/cpp/monlib/messagebus/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/messagebus/CMakeLists.txt
+++ b/library/cpp/monlib/messagebus/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/metrics/CMakeLists.darwin.txt b/library/cpp/monlib/metrics/CMakeLists.darwin-x86_64.txt
index 052ed067e1..052ed067e1 100644
--- a/library/cpp/monlib/metrics/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/metrics/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/metrics/CMakeLists.linux.txt b/library/cpp/monlib/metrics/CMakeLists.linux-x86_64.txt
index eb18b40c18..eb18b40c18 100644
--- a/library/cpp/monlib/metrics/CMakeLists.linux.txt
+++ b/library/cpp/monlib/metrics/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/metrics/CMakeLists.txt b/library/cpp/monlib/metrics/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/metrics/CMakeLists.txt
+++ b/library/cpp/monlib/metrics/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/service/CMakeLists.darwin.txt b/library/cpp/monlib/service/CMakeLists.darwin-x86_64.txt
index 48ffa45b49..48ffa45b49 100644
--- a/library/cpp/monlib/service/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/service/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/service/CMakeLists.linux.txt b/library/cpp/monlib/service/CMakeLists.linux-x86_64.txt
index 22d00e4e17..22d00e4e17 100644
--- a/library/cpp/monlib/service/CMakeLists.linux.txt
+++ b/library/cpp/monlib/service/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/service/CMakeLists.txt b/library/cpp/monlib/service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/service/CMakeLists.txt
+++ b/library/cpp/monlib/service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/service/pages/CMakeLists.darwin.txt b/library/cpp/monlib/service/pages/CMakeLists.darwin-x86_64.txt
index 062d269d30..062d269d30 100644
--- a/library/cpp/monlib/service/pages/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/service/pages/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/service/pages/CMakeLists.linux.txt b/library/cpp/monlib/service/pages/CMakeLists.linux-x86_64.txt
index 099a0191ef..099a0191ef 100644
--- a/library/cpp/monlib/service/pages/CMakeLists.linux.txt
+++ b/library/cpp/monlib/service/pages/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/service/pages/CMakeLists.txt b/library/cpp/monlib/service/pages/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/service/pages/CMakeLists.txt
+++ b/library/cpp/monlib/service/pages/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.darwin.txt b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.darwin-x86_64.txt
index 516c919f8a..516c919f8a 100644
--- a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.darwin.txt
+++ b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.linux.txt b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.linux-x86_64.txt
index 7e88b02a4b..7e88b02a4b 100644
--- a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.linux.txt
+++ b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt
+++ b/library/cpp/monlib/service/pages/tablesorter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/on_disk/chunks/CMakeLists.darwin.txt b/library/cpp/on_disk/chunks/CMakeLists.darwin-x86_64.txt
index ca761a26c8..ca761a26c8 100644
--- a/library/cpp/on_disk/chunks/CMakeLists.darwin.txt
+++ b/library/cpp/on_disk/chunks/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/on_disk/chunks/CMakeLists.linux.txt b/library/cpp/on_disk/chunks/CMakeLists.linux-x86_64.txt
index 7db2f54c16..7db2f54c16 100644
--- a/library/cpp/on_disk/chunks/CMakeLists.linux.txt
+++ b/library/cpp/on_disk/chunks/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/on_disk/chunks/CMakeLists.txt b/library/cpp/on_disk/chunks/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/on_disk/chunks/CMakeLists.txt
+++ b/library/cpp/on_disk/chunks/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/openssl/holders/CMakeLists.darwin.txt b/library/cpp/openssl/holders/CMakeLists.darwin-x86_64.txt
index f0e455f3aa..f0e455f3aa 100644
--- a/library/cpp/openssl/holders/CMakeLists.darwin.txt
+++ b/library/cpp/openssl/holders/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/openssl/holders/CMakeLists.linux.txt b/library/cpp/openssl/holders/CMakeLists.linux-x86_64.txt
index 59f7ba41c4..59f7ba41c4 100644
--- a/library/cpp/openssl/holders/CMakeLists.linux.txt
+++ b/library/cpp/openssl/holders/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/openssl/holders/CMakeLists.txt b/library/cpp/openssl/holders/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/openssl/holders/CMakeLists.txt
+++ b/library/cpp/openssl/holders/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/openssl/init/CMakeLists.darwin.txt b/library/cpp/openssl/init/CMakeLists.darwin-x86_64.txt
index 1ba4d2cebf..1ba4d2cebf 100644
--- a/library/cpp/openssl/init/CMakeLists.darwin.txt
+++ b/library/cpp/openssl/init/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/openssl/init/CMakeLists.linux.txt b/library/cpp/openssl/init/CMakeLists.linux-x86_64.txt
index cf53e73239..cf53e73239 100644
--- a/library/cpp/openssl/init/CMakeLists.linux.txt
+++ b/library/cpp/openssl/init/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/openssl/init/CMakeLists.txt b/library/cpp/openssl/init/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/openssl/init/CMakeLists.txt
+++ b/library/cpp/openssl/init/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/openssl/io/CMakeLists.darwin.txt b/library/cpp/openssl/io/CMakeLists.darwin-x86_64.txt
index 51c040ccd3..51c040ccd3 100644
--- a/library/cpp/openssl/io/CMakeLists.darwin.txt
+++ b/library/cpp/openssl/io/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/openssl/io/CMakeLists.linux.txt b/library/cpp/openssl/io/CMakeLists.linux-x86_64.txt
index e932afdd60..e932afdd60 100644
--- a/library/cpp/openssl/io/CMakeLists.linux.txt
+++ b/library/cpp/openssl/io/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/openssl/io/CMakeLists.txt b/library/cpp/openssl/io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/openssl/io/CMakeLists.txt
+++ b/library/cpp/openssl/io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/openssl/method/CMakeLists.darwin.txt b/library/cpp/openssl/method/CMakeLists.darwin-x86_64.txt
index fcca44537e..fcca44537e 100644
--- a/library/cpp/openssl/method/CMakeLists.darwin.txt
+++ b/library/cpp/openssl/method/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/openssl/method/CMakeLists.linux.txt b/library/cpp/openssl/method/CMakeLists.linux-x86_64.txt
index fab526fe7e..fab526fe7e 100644
--- a/library/cpp/openssl/method/CMakeLists.linux.txt
+++ b/library/cpp/openssl/method/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/openssl/method/CMakeLists.txt b/library/cpp/openssl/method/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/openssl/method/CMakeLists.txt
+++ b/library/cpp/openssl/method/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/packedtypes/CMakeLists.darwin.txt b/library/cpp/packedtypes/CMakeLists.darwin-x86_64.txt
index 9e3e6c0b53..9e3e6c0b53 100644
--- a/library/cpp/packedtypes/CMakeLists.darwin.txt
+++ b/library/cpp/packedtypes/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/packedtypes/CMakeLists.linux.txt b/library/cpp/packedtypes/CMakeLists.linux-x86_64.txt
index d2705961bd..d2705961bd 100644
--- a/library/cpp/packedtypes/CMakeLists.linux.txt
+++ b/library/cpp/packedtypes/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/packedtypes/CMakeLists.txt b/library/cpp/packedtypes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/packedtypes/CMakeLists.txt
+++ b/library/cpp/packedtypes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/packers/CMakeLists.darwin.txt b/library/cpp/packers/CMakeLists.darwin-x86_64.txt
index 59f8cfcaf5..59f8cfcaf5 100644
--- a/library/cpp/packers/CMakeLists.darwin.txt
+++ b/library/cpp/packers/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/packers/CMakeLists.linux.txt b/library/cpp/packers/CMakeLists.linux-x86_64.txt
index 6e4c5cd6b5..6e4c5cd6b5 100644
--- a/library/cpp/packers/CMakeLists.linux.txt
+++ b/library/cpp/packers/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/packers/CMakeLists.txt b/library/cpp/packers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/packers/CMakeLists.txt
+++ b/library/cpp/packers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/pop_count/CMakeLists.darwin.txt b/library/cpp/pop_count/CMakeLists.darwin-x86_64.txt
index 30961489be..30961489be 100644
--- a/library/cpp/pop_count/CMakeLists.darwin.txt
+++ b/library/cpp/pop_count/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/pop_count/CMakeLists.linux.txt b/library/cpp/pop_count/CMakeLists.linux-x86_64.txt
index 5aac2bc61f..5aac2bc61f 100644
--- a/library/cpp/pop_count/CMakeLists.linux.txt
+++ b/library/cpp/pop_count/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/pop_count/CMakeLists.txt b/library/cpp/pop_count/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/pop_count/CMakeLists.txt
+++ b/library/cpp/pop_count/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/presort/CMakeLists.darwin.txt b/library/cpp/presort/CMakeLists.darwin-x86_64.txt
index 5f8c72b28c..5f8c72b28c 100644
--- a/library/cpp/presort/CMakeLists.darwin.txt
+++ b/library/cpp/presort/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/presort/CMakeLists.linux.txt b/library/cpp/presort/CMakeLists.linux-x86_64.txt
index da006d6682..da006d6682 100644
--- a/library/cpp/presort/CMakeLists.linux.txt
+++ b/library/cpp/presort/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/presort/CMakeLists.txt b/library/cpp/presort/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/presort/CMakeLists.txt
+++ b/library/cpp/presort/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/protobuf/interop/CMakeLists.darwin.txt b/library/cpp/protobuf/interop/CMakeLists.darwin-x86_64.txt
index 61799c97ff..61799c97ff 100644
--- a/library/cpp/protobuf/interop/CMakeLists.darwin.txt
+++ b/library/cpp/protobuf/interop/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/protobuf/interop/CMakeLists.linux.txt b/library/cpp/protobuf/interop/CMakeLists.linux-x86_64.txt
index 0c2bd62d47..0c2bd62d47 100644
--- a/library/cpp/protobuf/interop/CMakeLists.linux.txt
+++ b/library/cpp/protobuf/interop/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/protobuf/interop/CMakeLists.txt b/library/cpp/protobuf/interop/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/protobuf/interop/CMakeLists.txt
+++ b/library/cpp/protobuf/interop/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/protobuf/json/CMakeLists.darwin.txt b/library/cpp/protobuf/json/CMakeLists.darwin-x86_64.txt
index 5eb786fb5b..5eb786fb5b 100644
--- a/library/cpp/protobuf/json/CMakeLists.darwin.txt
+++ b/library/cpp/protobuf/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/protobuf/json/CMakeLists.linux.txt b/library/cpp/protobuf/json/CMakeLists.linux-x86_64.txt
index 6fce8bebb0..6fce8bebb0 100644
--- a/library/cpp/protobuf/json/CMakeLists.linux.txt
+++ b/library/cpp/protobuf/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/protobuf/json/CMakeLists.txt b/library/cpp/protobuf/json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/protobuf/json/CMakeLists.txt
+++ b/library/cpp/protobuf/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/protobuf/util/CMakeLists.darwin.txt b/library/cpp/protobuf/util/CMakeLists.darwin-x86_64.txt
index 51b65cd5b9..51b65cd5b9 100644
--- a/library/cpp/protobuf/util/CMakeLists.darwin.txt
+++ b/library/cpp/protobuf/util/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/protobuf/util/CMakeLists.linux.txt b/library/cpp/protobuf/util/CMakeLists.linux-x86_64.txt
index 9ab7bb59e9..9ab7bb59e9 100644
--- a/library/cpp/protobuf/util/CMakeLists.linux.txt
+++ b/library/cpp/protobuf/util/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/protobuf/util/CMakeLists.txt b/library/cpp/protobuf/util/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/protobuf/util/CMakeLists.txt
+++ b/library/cpp/protobuf/util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/protobuf/util/proto/CMakeLists.darwin.txt b/library/cpp/protobuf/util/proto/CMakeLists.darwin-x86_64.txt
index 7a58b4bfeb..7a58b4bfeb 100644
--- a/library/cpp/protobuf/util/proto/CMakeLists.darwin.txt
+++ b/library/cpp/protobuf/util/proto/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/protobuf/util/proto/CMakeLists.linux.txt b/library/cpp/protobuf/util/proto/CMakeLists.linux-x86_64.txt
index 5f08e7a691..5f08e7a691 100644
--- a/library/cpp/protobuf/util/proto/CMakeLists.linux.txt
+++ b/library/cpp/protobuf/util/proto/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/protobuf/util/proto/CMakeLists.txt b/library/cpp/protobuf/util/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/protobuf/util/proto/CMakeLists.txt
+++ b/library/cpp/protobuf/util/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/random_provider/CMakeLists.darwin.txt b/library/cpp/random_provider/CMakeLists.darwin-x86_64.txt
index ac70e71b91..ac70e71b91 100644
--- a/library/cpp/random_provider/CMakeLists.darwin.txt
+++ b/library/cpp/random_provider/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/random_provider/CMakeLists.linux.txt b/library/cpp/random_provider/CMakeLists.linux-x86_64.txt
index 797bda818a..797bda818a 100644
--- a/library/cpp/random_provider/CMakeLists.linux.txt
+++ b/library/cpp/random_provider/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/random_provider/CMakeLists.txt b/library/cpp/random_provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/random_provider/CMakeLists.txt
+++ b/library/cpp/random_provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/regex/CMakeLists.darwin.txt b/library/cpp/regex/CMakeLists.darwin-x86_64.txt
index 6e2a4fabcd..6e2a4fabcd 100644
--- a/library/cpp/regex/CMakeLists.darwin.txt
+++ b/library/cpp/regex/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/regex/CMakeLists.linux.txt b/library/cpp/regex/CMakeLists.linux-x86_64.txt
index 6e2a4fabcd..6e2a4fabcd 100644
--- a/library/cpp/regex/CMakeLists.linux.txt
+++ b/library/cpp/regex/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/regex/CMakeLists.txt b/library/cpp/regex/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/regex/CMakeLists.txt
+++ b/library/cpp/regex/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/regex/hyperscan/CMakeLists.darwin.txt b/library/cpp/regex/hyperscan/CMakeLists.darwin-x86_64.txt
index 47150388a7..47150388a7 100644
--- a/library/cpp/regex/hyperscan/CMakeLists.darwin.txt
+++ b/library/cpp/regex/hyperscan/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/regex/hyperscan/CMakeLists.linux.txt b/library/cpp/regex/hyperscan/CMakeLists.linux-x86_64.txt
index 8c71567f3a..8c71567f3a 100644
--- a/library/cpp/regex/hyperscan/CMakeLists.linux.txt
+++ b/library/cpp/regex/hyperscan/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/regex/hyperscan/CMakeLists.txt b/library/cpp/regex/hyperscan/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/library/cpp/regex/hyperscan/CMakeLists.txt
+++ b/library/cpp/regex/hyperscan/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/regex/pcre/CMakeLists.darwin.txt b/library/cpp/regex/pcre/CMakeLists.darwin-x86_64.txt
index 8e01e97c1d..8e01e97c1d 100644
--- a/library/cpp/regex/pcre/CMakeLists.darwin.txt
+++ b/library/cpp/regex/pcre/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/regex/pcre/CMakeLists.linux.txt b/library/cpp/regex/pcre/CMakeLists.linux-x86_64.txt
index f526317f26..f526317f26 100644
--- a/library/cpp/regex/pcre/CMakeLists.linux.txt
+++ b/library/cpp/regex/pcre/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/regex/pcre/CMakeLists.txt b/library/cpp/regex/pcre/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/regex/pcre/CMakeLists.txt
+++ b/library/cpp/regex/pcre/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/regex/pire/CMakeLists.darwin.txt b/library/cpp/regex/pire/CMakeLists.darwin-x86_64.txt
index f1fde4acf6..f1fde4acf6 100644
--- a/library/cpp/regex/pire/CMakeLists.darwin.txt
+++ b/library/cpp/regex/pire/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/regex/pire/CMakeLists.linux.txt b/library/cpp/regex/pire/CMakeLists.linux-x86_64.txt
index 9c4715c689..9c4715c689 100644
--- a/library/cpp/regex/pire/CMakeLists.linux.txt
+++ b/library/cpp/regex/pire/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/regex/pire/CMakeLists.txt b/library/cpp/regex/pire/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/regex/pire/CMakeLists.txt
+++ b/library/cpp/regex/pire/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/resource/CMakeLists.darwin.txt b/library/cpp/resource/CMakeLists.darwin-x86_64.txt
index a73bc8800f..a73bc8800f 100644
--- a/library/cpp/resource/CMakeLists.darwin.txt
+++ b/library/cpp/resource/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/resource/CMakeLists.linux.txt b/library/cpp/resource/CMakeLists.linux-x86_64.txt
index e569656a95..e569656a95 100644
--- a/library/cpp/resource/CMakeLists.linux.txt
+++ b/library/cpp/resource/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/resource/CMakeLists.txt b/library/cpp/resource/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/resource/CMakeLists.txt
+++ b/library/cpp/resource/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/retry/CMakeLists.darwin.txt b/library/cpp/retry/CMakeLists.darwin-x86_64.txt
index 5cfb972bb5..5cfb972bb5 100644
--- a/library/cpp/retry/CMakeLists.darwin.txt
+++ b/library/cpp/retry/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/retry/CMakeLists.linux.txt b/library/cpp/retry/CMakeLists.linux-x86_64.txt
index ca2003e310..ca2003e310 100644
--- a/library/cpp/retry/CMakeLists.linux.txt
+++ b/library/cpp/retry/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/retry/CMakeLists.txt b/library/cpp/retry/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/retry/CMakeLists.txt
+++ b/library/cpp/retry/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/retry/protos/CMakeLists.darwin.txt b/library/cpp/retry/protos/CMakeLists.darwin-x86_64.txt
index ba41965df2..ba41965df2 100644
--- a/library/cpp/retry/protos/CMakeLists.darwin.txt
+++ b/library/cpp/retry/protos/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/retry/protos/CMakeLists.linux.txt b/library/cpp/retry/protos/CMakeLists.linux-x86_64.txt
index 3c4f9aed25..3c4f9aed25 100644
--- a/library/cpp/retry/protos/CMakeLists.linux.txt
+++ b/library/cpp/retry/protos/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/retry/protos/CMakeLists.txt b/library/cpp/retry/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/retry/protos/CMakeLists.txt
+++ b/library/cpp/retry/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/scheme/CMakeLists.darwin.txt b/library/cpp/scheme/CMakeLists.darwin-x86_64.txt
index 851add2e6c..851add2e6c 100644
--- a/library/cpp/scheme/CMakeLists.darwin.txt
+++ b/library/cpp/scheme/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/scheme/CMakeLists.linux.txt b/library/cpp/scheme/CMakeLists.linux-x86_64.txt
index 39139ce3c8..39139ce3c8 100644
--- a/library/cpp/scheme/CMakeLists.linux.txt
+++ b/library/cpp/scheme/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/scheme/CMakeLists.txt b/library/cpp/scheme/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/scheme/CMakeLists.txt
+++ b/library/cpp/scheme/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/sighandler/CMakeLists.darwin.txt b/library/cpp/sighandler/CMakeLists.darwin-x86_64.txt
index 3f330b9bb5..3f330b9bb5 100644
--- a/library/cpp/sighandler/CMakeLists.darwin.txt
+++ b/library/cpp/sighandler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/sighandler/CMakeLists.linux.txt b/library/cpp/sighandler/CMakeLists.linux-x86_64.txt
index 73b4b95275..73b4b95275 100644
--- a/library/cpp/sighandler/CMakeLists.linux.txt
+++ b/library/cpp/sighandler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/sighandler/CMakeLists.txt b/library/cpp/sighandler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/sighandler/CMakeLists.txt
+++ b/library/cpp/sighandler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/sliding_window/CMakeLists.darwin.txt b/library/cpp/sliding_window/CMakeLists.darwin-x86_64.txt
index 15be6f0095..15be6f0095 100644
--- a/library/cpp/sliding_window/CMakeLists.darwin.txt
+++ b/library/cpp/sliding_window/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/sliding_window/CMakeLists.linux.txt b/library/cpp/sliding_window/CMakeLists.linux-x86_64.txt
index 110e2807e9..110e2807e9 100644
--- a/library/cpp/sliding_window/CMakeLists.linux.txt
+++ b/library/cpp/sliding_window/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/sliding_window/CMakeLists.txt b/library/cpp/sliding_window/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/sliding_window/CMakeLists.txt
+++ b/library/cpp/sliding_window/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/sse/CMakeLists.darwin.txt b/library/cpp/sse/CMakeLists.darwin-x86_64.txt
index dbd80b1e0c..dbd80b1e0c 100644
--- a/library/cpp/sse/CMakeLists.darwin.txt
+++ b/library/cpp/sse/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/sse/CMakeLists.linux.txt b/library/cpp/sse/CMakeLists.linux-x86_64.txt
index 9266eb99ae..9266eb99ae 100644
--- a/library/cpp/sse/CMakeLists.linux.txt
+++ b/library/cpp/sse/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/sse/CMakeLists.txt b/library/cpp/sse/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/sse/CMakeLists.txt
+++ b/library/cpp/sse/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/brotli/CMakeLists.darwin.txt b/library/cpp/streams/brotli/CMakeLists.darwin-x86_64.txt
index 7102715952..7102715952 100644
--- a/library/cpp/streams/brotli/CMakeLists.darwin.txt
+++ b/library/cpp/streams/brotli/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/brotli/CMakeLists.linux.txt b/library/cpp/streams/brotli/CMakeLists.linux-x86_64.txt
index 37e5df6e79..37e5df6e79 100644
--- a/library/cpp/streams/brotli/CMakeLists.linux.txt
+++ b/library/cpp/streams/brotli/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/brotli/CMakeLists.txt b/library/cpp/streams/brotli/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/streams/brotli/CMakeLists.txt
+++ b/library/cpp/streams/brotli/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/bzip2/CMakeLists.darwin.txt b/library/cpp/streams/bzip2/CMakeLists.darwin-x86_64.txt
index 5afa320647..5afa320647 100644
--- a/library/cpp/streams/bzip2/CMakeLists.darwin.txt
+++ b/library/cpp/streams/bzip2/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/bzip2/CMakeLists.linux.txt b/library/cpp/streams/bzip2/CMakeLists.linux-x86_64.txt
index d8cfeb870f..d8cfeb870f 100644
--- a/library/cpp/streams/bzip2/CMakeLists.linux.txt
+++ b/library/cpp/streams/bzip2/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/bzip2/CMakeLists.txt b/library/cpp/streams/bzip2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/streams/bzip2/CMakeLists.txt
+++ b/library/cpp/streams/bzip2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/lzma/CMakeLists.darwin.txt b/library/cpp/streams/lzma/CMakeLists.darwin-x86_64.txt
index 3e5c652aee..3e5c652aee 100644
--- a/library/cpp/streams/lzma/CMakeLists.darwin.txt
+++ b/library/cpp/streams/lzma/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/lzma/CMakeLists.linux.txt b/library/cpp/streams/lzma/CMakeLists.linux-x86_64.txt
index 3893a3ea8b..3893a3ea8b 100644
--- a/library/cpp/streams/lzma/CMakeLists.linux.txt
+++ b/library/cpp/streams/lzma/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/lzma/CMakeLists.txt b/library/cpp/streams/lzma/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/streams/lzma/CMakeLists.txt
+++ b/library/cpp/streams/lzma/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/zc_memory_input/CMakeLists.darwin.txt b/library/cpp/streams/zc_memory_input/CMakeLists.darwin-x86_64.txt
index e0ddfec96c..e0ddfec96c 100644
--- a/library/cpp/streams/zc_memory_input/CMakeLists.darwin.txt
+++ b/library/cpp/streams/zc_memory_input/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/zc_memory_input/CMakeLists.linux.txt b/library/cpp/streams/zc_memory_input/CMakeLists.linux-x86_64.txt
index 557f29655b..557f29655b 100644
--- a/library/cpp/streams/zc_memory_input/CMakeLists.linux.txt
+++ b/library/cpp/streams/zc_memory_input/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/zc_memory_input/CMakeLists.txt b/library/cpp/streams/zc_memory_input/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/streams/zc_memory_input/CMakeLists.txt
+++ b/library/cpp/streams/zc_memory_input/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/streams/zstd/CMakeLists.darwin.txt b/library/cpp/streams/zstd/CMakeLists.darwin-x86_64.txt
index 9a3521cd9b..9a3521cd9b 100644
--- a/library/cpp/streams/zstd/CMakeLists.darwin.txt
+++ b/library/cpp/streams/zstd/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/streams/zstd/CMakeLists.linux.txt b/library/cpp/streams/zstd/CMakeLists.linux-x86_64.txt
index a48d43f3fd..a48d43f3fd 100644
--- a/library/cpp/streams/zstd/CMakeLists.linux.txt
+++ b/library/cpp/streams/zstd/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/streams/zstd/CMakeLists.txt b/library/cpp/streams/zstd/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/streams/zstd/CMakeLists.txt
+++ b/library/cpp/streams/zstd/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/base64/CMakeLists.darwin.txt b/library/cpp/string_utils/base64/CMakeLists.darwin-x86_64.txt
index d4f74e8dc0..d4f74e8dc0 100644
--- a/library/cpp/string_utils/base64/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/base64/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/base64/CMakeLists.linux.txt b/library/cpp/string_utils/base64/CMakeLists.linux-x86_64.txt
index d5a19ed8ea..d5a19ed8ea 100644
--- a/library/cpp/string_utils/base64/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/base64/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/base64/CMakeLists.txt b/library/cpp/string_utils/base64/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/base64/CMakeLists.txt
+++ b/library/cpp/string_utils/base64/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/csv/CMakeLists.darwin.txt b/library/cpp/string_utils/csv/CMakeLists.darwin-x86_64.txt
index d50b571fde..d50b571fde 100644
--- a/library/cpp/string_utils/csv/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/csv/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/csv/CMakeLists.linux.txt b/library/cpp/string_utils/csv/CMakeLists.linux-x86_64.txt
index c5389658b1..c5389658b1 100644
--- a/library/cpp/string_utils/csv/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/csv/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/csv/CMakeLists.txt b/library/cpp/string_utils/csv/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/csv/CMakeLists.txt
+++ b/library/cpp/string_utils/csv/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/indent_text/CMakeLists.darwin.txt b/library/cpp/string_utils/indent_text/CMakeLists.darwin-x86_64.txt
index 6eca107f7f..6eca107f7f 100644
--- a/library/cpp/string_utils/indent_text/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/indent_text/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/indent_text/CMakeLists.linux.txt b/library/cpp/string_utils/indent_text/CMakeLists.linux-x86_64.txt
index afeec637dd..afeec637dd 100644
--- a/library/cpp/string_utils/indent_text/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/indent_text/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/indent_text/CMakeLists.txt b/library/cpp/string_utils/indent_text/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/indent_text/CMakeLists.txt
+++ b/library/cpp/string_utils/indent_text/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/levenshtein_diff/CMakeLists.darwin.txt b/library/cpp/string_utils/levenshtein_diff/CMakeLists.darwin-x86_64.txt
index 0d86ce0e67..0d86ce0e67 100644
--- a/library/cpp/string_utils/levenshtein_diff/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/levenshtein_diff/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/levenshtein_diff/CMakeLists.linux.txt b/library/cpp/string_utils/levenshtein_diff/CMakeLists.linux-x86_64.txt
index 18f5590ef9..18f5590ef9 100644
--- a/library/cpp/string_utils/levenshtein_diff/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/levenshtein_diff/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/levenshtein_diff/CMakeLists.txt b/library/cpp/string_utils/levenshtein_diff/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/levenshtein_diff/CMakeLists.txt
+++ b/library/cpp/string_utils/levenshtein_diff/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/parse_size/CMakeLists.darwin.txt b/library/cpp/string_utils/parse_size/CMakeLists.darwin-x86_64.txt
index 5cd758efec..5cd758efec 100644
--- a/library/cpp/string_utils/parse_size/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/parse_size/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/parse_size/CMakeLists.linux.txt b/library/cpp/string_utils/parse_size/CMakeLists.linux-x86_64.txt
index c50fd344c4..c50fd344c4 100644
--- a/library/cpp/string_utils/parse_size/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/parse_size/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/parse_size/CMakeLists.txt b/library/cpp/string_utils/parse_size/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/parse_size/CMakeLists.txt
+++ b/library/cpp/string_utils/parse_size/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/quote/CMakeLists.darwin.txt b/library/cpp/string_utils/quote/CMakeLists.darwin-x86_64.txt
index e2bedf1e18..e2bedf1e18 100644
--- a/library/cpp/string_utils/quote/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/quote/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/quote/CMakeLists.linux.txt b/library/cpp/string_utils/quote/CMakeLists.linux-x86_64.txt
index 28d1aabe8d..28d1aabe8d 100644
--- a/library/cpp/string_utils/quote/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/quote/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/quote/CMakeLists.txt b/library/cpp/string_utils/quote/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/quote/CMakeLists.txt
+++ b/library/cpp/string_utils/quote/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/relaxed_escaper/CMakeLists.darwin.txt b/library/cpp/string_utils/relaxed_escaper/CMakeLists.darwin-x86_64.txt
index 14901bec18..14901bec18 100644
--- a/library/cpp/string_utils/relaxed_escaper/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/relaxed_escaper/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/relaxed_escaper/CMakeLists.linux.txt b/library/cpp/string_utils/relaxed_escaper/CMakeLists.linux-x86_64.txt
index 6e952b8940..6e952b8940 100644
--- a/library/cpp/string_utils/relaxed_escaper/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/relaxed_escaper/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt b/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt
+++ b/library/cpp/string_utils/relaxed_escaper/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/scan/CMakeLists.darwin.txt b/library/cpp/string_utils/scan/CMakeLists.darwin-x86_64.txt
index 3d7752c1ff..3d7752c1ff 100644
--- a/library/cpp/string_utils/scan/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/scan/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/scan/CMakeLists.linux.txt b/library/cpp/string_utils/scan/CMakeLists.linux-x86_64.txt
index 4359ec58c0..4359ec58c0 100644
--- a/library/cpp/string_utils/scan/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/scan/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/scan/CMakeLists.txt b/library/cpp/string_utils/scan/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/scan/CMakeLists.txt
+++ b/library/cpp/string_utils/scan/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/url/CMakeLists.darwin.txt b/library/cpp/string_utils/url/CMakeLists.darwin-x86_64.txt
index 672139e643..672139e643 100644
--- a/library/cpp/string_utils/url/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/url/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/url/CMakeLists.linux.txt b/library/cpp/string_utils/url/CMakeLists.linux-x86_64.txt
index b84dcb3263..b84dcb3263 100644
--- a/library/cpp/string_utils/url/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/url/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/url/CMakeLists.txt b/library/cpp/string_utils/url/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/url/CMakeLists.txt
+++ b/library/cpp/string_utils/url/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/string_utils/ztstrbuf/CMakeLists.darwin.txt b/library/cpp/string_utils/ztstrbuf/CMakeLists.darwin-x86_64.txt
index b686760229..b686760229 100644
--- a/library/cpp/string_utils/ztstrbuf/CMakeLists.darwin.txt
+++ b/library/cpp/string_utils/ztstrbuf/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/string_utils/ztstrbuf/CMakeLists.linux.txt b/library/cpp/string_utils/ztstrbuf/CMakeLists.linux-x86_64.txt
index 370fd83097..370fd83097 100644
--- a/library/cpp/string_utils/ztstrbuf/CMakeLists.linux.txt
+++ b/library/cpp/string_utils/ztstrbuf/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/string_utils/ztstrbuf/CMakeLists.txt b/library/cpp/string_utils/ztstrbuf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/string_utils/ztstrbuf/CMakeLists.txt
+++ b/library/cpp/string_utils/ztstrbuf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/svnversion/CMakeLists.darwin.txt b/library/cpp/svnversion/CMakeLists.darwin-x86_64.txt
index f767e929b8..f767e929b8 100644
--- a/library/cpp/svnversion/CMakeLists.darwin.txt
+++ b/library/cpp/svnversion/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/svnversion/CMakeLists.linux.txt b/library/cpp/svnversion/CMakeLists.linux-x86_64.txt
index f37d20f4d1..f37d20f4d1 100644
--- a/library/cpp/svnversion/CMakeLists.linux.txt
+++ b/library/cpp/svnversion/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/svnversion/CMakeLists.txt b/library/cpp/svnversion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/svnversion/CMakeLists.txt
+++ b/library/cpp/svnversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/tdigest/CMakeLists.darwin.txt b/library/cpp/tdigest/CMakeLists.darwin-x86_64.txt
index 9dd7437db0..9dd7437db0 100644
--- a/library/cpp/tdigest/CMakeLists.darwin.txt
+++ b/library/cpp/tdigest/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/tdigest/CMakeLists.linux.txt b/library/cpp/tdigest/CMakeLists.linux-x86_64.txt
index 2fdc4b7b12..2fdc4b7b12 100644
--- a/library/cpp/tdigest/CMakeLists.linux.txt
+++ b/library/cpp/tdigest/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/tdigest/CMakeLists.txt b/library/cpp/tdigest/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/tdigest/CMakeLists.txt
+++ b/library/cpp/tdigest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/terminate_handler/CMakeLists.darwin.txt b/library/cpp/terminate_handler/CMakeLists.darwin-x86_64.txt
index 050a5323bd..050a5323bd 100644
--- a/library/cpp/terminate_handler/CMakeLists.darwin.txt
+++ b/library/cpp/terminate_handler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/terminate_handler/CMakeLists.linux.txt b/library/cpp/terminate_handler/CMakeLists.linux-x86_64.txt
index 48d55d42ce..48d55d42ce 100644
--- a/library/cpp/terminate_handler/CMakeLists.linux.txt
+++ b/library/cpp/terminate_handler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/terminate_handler/CMakeLists.txt b/library/cpp/terminate_handler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/terminate_handler/CMakeLists.txt
+++ b/library/cpp/terminate_handler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/benchmark/CMakeLists.darwin.txt b/library/cpp/testing/benchmark/CMakeLists.darwin-x86_64.txt
index c68241bc9e..c68241bc9e 100644
--- a/library/cpp/testing/benchmark/CMakeLists.darwin.txt
+++ b/library/cpp/testing/benchmark/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/benchmark/CMakeLists.linux.txt b/library/cpp/testing/benchmark/CMakeLists.linux-x86_64.txt
index 84161c1c43..84161c1c43 100644
--- a/library/cpp/testing/benchmark/CMakeLists.linux.txt
+++ b/library/cpp/testing/benchmark/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/benchmark/CMakeLists.txt b/library/cpp/testing/benchmark/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/benchmark/CMakeLists.txt
+++ b/library/cpp/testing/benchmark/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/benchmark/main/CMakeLists.darwin.txt b/library/cpp/testing/benchmark/main/CMakeLists.darwin-x86_64.txt
index 15cbe3d5ac..15cbe3d5ac 100644
--- a/library/cpp/testing/benchmark/main/CMakeLists.darwin.txt
+++ b/library/cpp/testing/benchmark/main/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/benchmark/main/CMakeLists.linux.txt b/library/cpp/testing/benchmark/main/CMakeLists.linux-x86_64.txt
index 3f580358e3..3f580358e3 100644
--- a/library/cpp/testing/benchmark/main/CMakeLists.linux.txt
+++ b/library/cpp/testing/benchmark/main/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/benchmark/main/CMakeLists.txt b/library/cpp/testing/benchmark/main/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/benchmark/main/CMakeLists.txt
+++ b/library/cpp/testing/benchmark/main/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/common/CMakeLists.darwin.txt b/library/cpp/testing/common/CMakeLists.darwin-x86_64.txt
index c795d4ebeb..c795d4ebeb 100644
--- a/library/cpp/testing/common/CMakeLists.darwin.txt
+++ b/library/cpp/testing/common/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/common/CMakeLists.linux.txt b/library/cpp/testing/common/CMakeLists.linux-x86_64.txt
index 261d374dc8..261d374dc8 100644
--- a/library/cpp/testing/common/CMakeLists.linux.txt
+++ b/library/cpp/testing/common/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/common/CMakeLists.txt b/library/cpp/testing/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/common/CMakeLists.txt
+++ b/library/cpp/testing/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/gmock_in_unittest/CMakeLists.darwin.txt b/library/cpp/testing/gmock_in_unittest/CMakeLists.darwin-x86_64.txt
index 8a20efaed0..8a20efaed0 100644
--- a/library/cpp/testing/gmock_in_unittest/CMakeLists.darwin.txt
+++ b/library/cpp/testing/gmock_in_unittest/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/gmock_in_unittest/CMakeLists.linux.txt b/library/cpp/testing/gmock_in_unittest/CMakeLists.linux-x86_64.txt
index 29717189de..29717189de 100644
--- a/library/cpp/testing/gmock_in_unittest/CMakeLists.linux.txt
+++ b/library/cpp/testing/gmock_in_unittest/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/gmock_in_unittest/CMakeLists.txt b/library/cpp/testing/gmock_in_unittest/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/gmock_in_unittest/CMakeLists.txt
+++ b/library/cpp/testing/gmock_in_unittest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/gtest/CMakeLists.darwin.txt b/library/cpp/testing/gtest/CMakeLists.darwin-x86_64.txt
index 41bc7e20f9..41bc7e20f9 100644
--- a/library/cpp/testing/gtest/CMakeLists.darwin.txt
+++ b/library/cpp/testing/gtest/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/gtest/CMakeLists.linux.txt b/library/cpp/testing/gtest/CMakeLists.linux-x86_64.txt
index e172e2381a..e172e2381a 100644
--- a/library/cpp/testing/gtest/CMakeLists.linux.txt
+++ b/library/cpp/testing/gtest/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/gtest/CMakeLists.txt b/library/cpp/testing/gtest/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/gtest/CMakeLists.txt
+++ b/library/cpp/testing/gtest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/gtest_extensions/CMakeLists.darwin.txt b/library/cpp/testing/gtest_extensions/CMakeLists.darwin-x86_64.txt
index 3557a689eb..3557a689eb 100644
--- a/library/cpp/testing/gtest_extensions/CMakeLists.darwin.txt
+++ b/library/cpp/testing/gtest_extensions/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/gtest_extensions/CMakeLists.linux.txt b/library/cpp/testing/gtest_extensions/CMakeLists.linux-x86_64.txt
index fba9c841de..fba9c841de 100644
--- a/library/cpp/testing/gtest_extensions/CMakeLists.linux.txt
+++ b/library/cpp/testing/gtest_extensions/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/gtest_extensions/CMakeLists.txt b/library/cpp/testing/gtest_extensions/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/gtest_extensions/CMakeLists.txt
+++ b/library/cpp/testing/gtest_extensions/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/gtest_main/CMakeLists.darwin.txt b/library/cpp/testing/gtest_main/CMakeLists.darwin-x86_64.txt
index 1075010e22..1075010e22 100644
--- a/library/cpp/testing/gtest_main/CMakeLists.darwin.txt
+++ b/library/cpp/testing/gtest_main/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/gtest_main/CMakeLists.linux.txt b/library/cpp/testing/gtest_main/CMakeLists.linux-x86_64.txt
index f3ef692fb6..f3ef692fb6 100644
--- a/library/cpp/testing/gtest_main/CMakeLists.linux.txt
+++ b/library/cpp/testing/gtest_main/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/gtest_main/CMakeLists.txt b/library/cpp/testing/gtest_main/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/gtest_main/CMakeLists.txt
+++ b/library/cpp/testing/gtest_main/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/hook/CMakeLists.darwin.txt b/library/cpp/testing/hook/CMakeLists.darwin-x86_64.txt
index 14cff14af7..14cff14af7 100644
--- a/library/cpp/testing/hook/CMakeLists.darwin.txt
+++ b/library/cpp/testing/hook/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/hook/CMakeLists.linux.txt b/library/cpp/testing/hook/CMakeLists.linux-x86_64.txt
index ee777c46ff..ee777c46ff 100644
--- a/library/cpp/testing/hook/CMakeLists.linux.txt
+++ b/library/cpp/testing/hook/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/hook/CMakeLists.txt b/library/cpp/testing/hook/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/hook/CMakeLists.txt
+++ b/library/cpp/testing/hook/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/unittest/CMakeLists.darwin.txt b/library/cpp/testing/unittest/CMakeLists.darwin-x86_64.txt
index 64dc3e1a7a..64dc3e1a7a 100644
--- a/library/cpp/testing/unittest/CMakeLists.darwin.txt
+++ b/library/cpp/testing/unittest/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/unittest/CMakeLists.linux.txt b/library/cpp/testing/unittest/CMakeLists.linux-x86_64.txt
index 860a713a0b..860a713a0b 100644
--- a/library/cpp/testing/unittest/CMakeLists.linux.txt
+++ b/library/cpp/testing/unittest/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/unittest/CMakeLists.txt b/library/cpp/testing/unittest/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/unittest/CMakeLists.txt
+++ b/library/cpp/testing/unittest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/testing/unittest_main/CMakeLists.darwin.txt b/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt
index 47d1aa79f6..47d1aa79f6 100644
--- a/library/cpp/testing/unittest_main/CMakeLists.darwin.txt
+++ b/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/testing/unittest_main/CMakeLists.linux.txt b/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt
index 38c9a6036d..38c9a6036d 100644
--- a/library/cpp/testing/unittest_main/CMakeLists.linux.txt
+++ b/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/testing/unittest_main/CMakeLists.txt b/library/cpp/testing/unittest_main/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/testing/unittest_main/CMakeLists.txt
+++ b/library/cpp/testing/unittest_main/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/atomic/CMakeLists.darwin.txt b/library/cpp/threading/atomic/CMakeLists.darwin-x86_64.txt
index d9f7098b34..d9f7098b34 100644
--- a/library/cpp/threading/atomic/CMakeLists.darwin.txt
+++ b/library/cpp/threading/atomic/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/atomic/CMakeLists.linux.txt b/library/cpp/threading/atomic/CMakeLists.linux-x86_64.txt
index a43a658908..a43a658908 100644
--- a/library/cpp/threading/atomic/CMakeLists.linux.txt
+++ b/library/cpp/threading/atomic/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/atomic/CMakeLists.txt b/library/cpp/threading/atomic/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/atomic/CMakeLists.txt
+++ b/library/cpp/threading/atomic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/chunk_queue/CMakeLists.darwin.txt b/library/cpp/threading/chunk_queue/CMakeLists.darwin-x86_64.txt
index 454bf560f9..454bf560f9 100644
--- a/library/cpp/threading/chunk_queue/CMakeLists.darwin.txt
+++ b/library/cpp/threading/chunk_queue/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/chunk_queue/CMakeLists.linux.txt b/library/cpp/threading/chunk_queue/CMakeLists.linux-x86_64.txt
index d8895e6dbf..d8895e6dbf 100644
--- a/library/cpp/threading/chunk_queue/CMakeLists.linux.txt
+++ b/library/cpp/threading/chunk_queue/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/chunk_queue/CMakeLists.txt b/library/cpp/threading/chunk_queue/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/chunk_queue/CMakeLists.txt
+++ b/library/cpp/threading/chunk_queue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/equeue/CMakeLists.darwin.txt b/library/cpp/threading/equeue/CMakeLists.darwin-x86_64.txt
index 902b6d7a9a..902b6d7a9a 100644
--- a/library/cpp/threading/equeue/CMakeLists.darwin.txt
+++ b/library/cpp/threading/equeue/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/equeue/CMakeLists.linux.txt b/library/cpp/threading/equeue/CMakeLists.linux-x86_64.txt
index 5653d3d3f3..5653d3d3f3 100644
--- a/library/cpp/threading/equeue/CMakeLists.linux.txt
+++ b/library/cpp/threading/equeue/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/equeue/CMakeLists.txt b/library/cpp/threading/equeue/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/equeue/CMakeLists.txt
+++ b/library/cpp/threading/equeue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/future/CMakeLists.darwin.txt b/library/cpp/threading/future/CMakeLists.darwin-x86_64.txt
index 66d221dbbb..66d221dbbb 100644
--- a/library/cpp/threading/future/CMakeLists.darwin.txt
+++ b/library/cpp/threading/future/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/future/CMakeLists.linux.txt b/library/cpp/threading/future/CMakeLists.linux-x86_64.txt
index ae643a1bc4..ae643a1bc4 100644
--- a/library/cpp/threading/future/CMakeLists.linux.txt
+++ b/library/cpp/threading/future/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/future/CMakeLists.txt b/library/cpp/threading/future/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/future/CMakeLists.txt
+++ b/library/cpp/threading/future/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/light_rw_lock/CMakeLists.darwin.txt b/library/cpp/threading/light_rw_lock/CMakeLists.darwin-x86_64.txt
index 934c52018e..934c52018e 100644
--- a/library/cpp/threading/light_rw_lock/CMakeLists.darwin.txt
+++ b/library/cpp/threading/light_rw_lock/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/light_rw_lock/CMakeLists.linux.txt b/library/cpp/threading/light_rw_lock/CMakeLists.linux-x86_64.txt
index 2f54f7fe5b..2f54f7fe5b 100644
--- a/library/cpp/threading/light_rw_lock/CMakeLists.linux.txt
+++ b/library/cpp/threading/light_rw_lock/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/light_rw_lock/CMakeLists.txt b/library/cpp/threading/light_rw_lock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/light_rw_lock/CMakeLists.txt
+++ b/library/cpp/threading/light_rw_lock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/local_executor/CMakeLists.darwin.txt b/library/cpp/threading/local_executor/CMakeLists.darwin-x86_64.txt
index a88a439f24..a88a439f24 100644
--- a/library/cpp/threading/local_executor/CMakeLists.darwin.txt
+++ b/library/cpp/threading/local_executor/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/local_executor/CMakeLists.linux.txt b/library/cpp/threading/local_executor/CMakeLists.linux-x86_64.txt
index ab5a6d971f..ab5a6d971f 100644
--- a/library/cpp/threading/local_executor/CMakeLists.linux.txt
+++ b/library/cpp/threading/local_executor/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/local_executor/CMakeLists.txt b/library/cpp/threading/local_executor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/local_executor/CMakeLists.txt
+++ b/library/cpp/threading/local_executor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/poor_man_openmp/CMakeLists.darwin.txt b/library/cpp/threading/poor_man_openmp/CMakeLists.darwin-x86_64.txt
index 116045cc83..116045cc83 100644
--- a/library/cpp/threading/poor_man_openmp/CMakeLists.darwin.txt
+++ b/library/cpp/threading/poor_man_openmp/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/poor_man_openmp/CMakeLists.linux.txt b/library/cpp/threading/poor_man_openmp/CMakeLists.linux-x86_64.txt
index a33df23eac..a33df23eac 100644
--- a/library/cpp/threading/poor_man_openmp/CMakeLists.linux.txt
+++ b/library/cpp/threading/poor_man_openmp/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/poor_man_openmp/CMakeLists.txt b/library/cpp/threading/poor_man_openmp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/poor_man_openmp/CMakeLists.txt
+++ b/library/cpp/threading/poor_man_openmp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/queue/CMakeLists.darwin.txt b/library/cpp/threading/queue/CMakeLists.darwin-x86_64.txt
index ff0797688e..ff0797688e 100644
--- a/library/cpp/threading/queue/CMakeLists.darwin.txt
+++ b/library/cpp/threading/queue/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/queue/CMakeLists.linux.txt b/library/cpp/threading/queue/CMakeLists.linux-x86_64.txt
index c6338ea17b..c6338ea17b 100644
--- a/library/cpp/threading/queue/CMakeLists.linux.txt
+++ b/library/cpp/threading/queue/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/queue/CMakeLists.txt b/library/cpp/threading/queue/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/queue/CMakeLists.txt
+++ b/library/cpp/threading/queue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/skip_list/CMakeLists.darwin.txt b/library/cpp/threading/skip_list/CMakeLists.darwin-x86_64.txt
index e364879e72..e364879e72 100644
--- a/library/cpp/threading/skip_list/CMakeLists.darwin.txt
+++ b/library/cpp/threading/skip_list/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/skip_list/CMakeLists.linux.txt b/library/cpp/threading/skip_list/CMakeLists.linux-x86_64.txt
index 81907f6776..81907f6776 100644
--- a/library/cpp/threading/skip_list/CMakeLists.linux.txt
+++ b/library/cpp/threading/skip_list/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/skip_list/CMakeLists.txt b/library/cpp/threading/skip_list/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/skip_list/CMakeLists.txt
+++ b/library/cpp/threading/skip_list/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/threading/task_scheduler/CMakeLists.darwin.txt b/library/cpp/threading/task_scheduler/CMakeLists.darwin-x86_64.txt
index 61c6127690..61c6127690 100644
--- a/library/cpp/threading/task_scheduler/CMakeLists.darwin.txt
+++ b/library/cpp/threading/task_scheduler/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/threading/task_scheduler/CMakeLists.linux.txt b/library/cpp/threading/task_scheduler/CMakeLists.linux-x86_64.txt
index 929d3f00db..929d3f00db 100644
--- a/library/cpp/threading/task_scheduler/CMakeLists.linux.txt
+++ b/library/cpp/threading/task_scheduler/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/threading/task_scheduler/CMakeLists.txt b/library/cpp/threading/task_scheduler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/threading/task_scheduler/CMakeLists.txt
+++ b/library/cpp/threading/task_scheduler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/time_provider/CMakeLists.darwin.txt b/library/cpp/time_provider/CMakeLists.darwin-x86_64.txt
index 5106037589..5106037589 100644
--- a/library/cpp/time_provider/CMakeLists.darwin.txt
+++ b/library/cpp/time_provider/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/time_provider/CMakeLists.linux.txt b/library/cpp/time_provider/CMakeLists.linux-x86_64.txt
index e35e99bf80..e35e99bf80 100644
--- a/library/cpp/time_provider/CMakeLists.linux.txt
+++ b/library/cpp/time_provider/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/time_provider/CMakeLists.txt b/library/cpp/time_provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/time_provider/CMakeLists.txt
+++ b/library/cpp/time_provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/timezone_conversion/CMakeLists.darwin.txt b/library/cpp/timezone_conversion/CMakeLists.darwin-x86_64.txt
index 0d060c2699..0d060c2699 100644
--- a/library/cpp/timezone_conversion/CMakeLists.darwin.txt
+++ b/library/cpp/timezone_conversion/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/timezone_conversion/CMakeLists.linux.txt b/library/cpp/timezone_conversion/CMakeLists.linux-x86_64.txt
index daf50a668e..daf50a668e 100644
--- a/library/cpp/timezone_conversion/CMakeLists.linux.txt
+++ b/library/cpp/timezone_conversion/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/timezone_conversion/CMakeLists.txt b/library/cpp/timezone_conversion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/timezone_conversion/CMakeLists.txt
+++ b/library/cpp/timezone_conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/tld/CMakeLists.darwin.txt b/library/cpp/tld/CMakeLists.darwin-x86_64.txt
index cf90e8b74f..cf90e8b74f 100644
--- a/library/cpp/tld/CMakeLists.darwin.txt
+++ b/library/cpp/tld/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/tld/CMakeLists.linux.txt b/library/cpp/tld/CMakeLists.linux-x86_64.txt
index 30fe436180..30fe436180 100644
--- a/library/cpp/tld/CMakeLists.linux.txt
+++ b/library/cpp/tld/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/tld/CMakeLists.txt b/library/cpp/tld/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/tld/CMakeLists.txt
+++ b/library/cpp/tld/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unicode/normalization/CMakeLists.darwin.txt b/library/cpp/unicode/normalization/CMakeLists.darwin-x86_64.txt
index faa65c7f2b..faa65c7f2b 100644
--- a/library/cpp/unicode/normalization/CMakeLists.darwin.txt
+++ b/library/cpp/unicode/normalization/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unicode/normalization/CMakeLists.linux.txt b/library/cpp/unicode/normalization/CMakeLists.linux-x86_64.txt
index 8f5bf5189e..8f5bf5189e 100644
--- a/library/cpp/unicode/normalization/CMakeLists.linux.txt
+++ b/library/cpp/unicode/normalization/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unicode/normalization/CMakeLists.txt b/library/cpp/unicode/normalization/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/unicode/normalization/CMakeLists.txt
+++ b/library/cpp/unicode/normalization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unicode/punycode/CMakeLists.darwin.txt b/library/cpp/unicode/punycode/CMakeLists.darwin-x86_64.txt
index 25c06c3bbc..25c06c3bbc 100644
--- a/library/cpp/unicode/punycode/CMakeLists.darwin.txt
+++ b/library/cpp/unicode/punycode/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unicode/punycode/CMakeLists.linux.txt b/library/cpp/unicode/punycode/CMakeLists.linux-x86_64.txt
index 5265c3ec30..5265c3ec30 100644
--- a/library/cpp/unicode/punycode/CMakeLists.linux.txt
+++ b/library/cpp/unicode/punycode/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unicode/punycode/CMakeLists.txt b/library/cpp/unicode/punycode/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/unicode/punycode/CMakeLists.txt
+++ b/library/cpp/unicode/punycode/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unicode/set/CMakeLists.darwin.txt b/library/cpp/unicode/set/CMakeLists.darwin-x86_64.txt
index 81e3230ffe..81e3230ffe 100644
--- a/library/cpp/unicode/set/CMakeLists.darwin.txt
+++ b/library/cpp/unicode/set/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unicode/set/CMakeLists.linux.txt b/library/cpp/unicode/set/CMakeLists.linux-x86_64.txt
index 1746645e0c..1746645e0c 100644
--- a/library/cpp/unicode/set/CMakeLists.linux.txt
+++ b/library/cpp/unicode/set/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unicode/set/CMakeLists.txt b/library/cpp/unicode/set/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/unicode/set/CMakeLists.txt
+++ b/library/cpp/unicode/set/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unified_agent_client/CMakeLists.darwin.txt b/library/cpp/unified_agent_client/CMakeLists.darwin-x86_64.txt
index c681f29c5b..c681f29c5b 100644
--- a/library/cpp/unified_agent_client/CMakeLists.darwin.txt
+++ b/library/cpp/unified_agent_client/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unified_agent_client/CMakeLists.linux.txt b/library/cpp/unified_agent_client/CMakeLists.linux-x86_64.txt
index 84821c3369..84821c3369 100644
--- a/library/cpp/unified_agent_client/CMakeLists.linux.txt
+++ b/library/cpp/unified_agent_client/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unified_agent_client/CMakeLists.txt b/library/cpp/unified_agent_client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/unified_agent_client/CMakeLists.txt
+++ b/library/cpp/unified_agent_client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/unified_agent_client/proto/CMakeLists.darwin.txt b/library/cpp/unified_agent_client/proto/CMakeLists.darwin-x86_64.txt
index 6f12b2aa5e..6f12b2aa5e 100644
--- a/library/cpp/unified_agent_client/proto/CMakeLists.darwin.txt
+++ b/library/cpp/unified_agent_client/proto/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/unified_agent_client/proto/CMakeLists.linux.txt b/library/cpp/unified_agent_client/proto/CMakeLists.linux-x86_64.txt
index 571e21b861..571e21b861 100644
--- a/library/cpp/unified_agent_client/proto/CMakeLists.linux.txt
+++ b/library/cpp/unified_agent_client/proto/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/unified_agent_client/proto/CMakeLists.txt b/library/cpp/unified_agent_client/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/unified_agent_client/proto/CMakeLists.txt
+++ b/library/cpp/unified_agent_client/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/uri/CMakeLists.darwin.txt b/library/cpp/uri/CMakeLists.darwin-x86_64.txt
index f4437a0a2b..f4437a0a2b 100644
--- a/library/cpp/uri/CMakeLists.darwin.txt
+++ b/library/cpp/uri/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/uri/CMakeLists.linux.txt b/library/cpp/uri/CMakeLists.linux-x86_64.txt
index e5d2e1e281..e5d2e1e281 100644
--- a/library/cpp/uri/CMakeLists.linux.txt
+++ b/library/cpp/uri/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/uri/CMakeLists.txt b/library/cpp/uri/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/uri/CMakeLists.txt
+++ b/library/cpp/uri/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/xml/document/CMakeLists.darwin.txt b/library/cpp/xml/document/CMakeLists.darwin-x86_64.txt
index 78de390e21..78de390e21 100644
--- a/library/cpp/xml/document/CMakeLists.darwin.txt
+++ b/library/cpp/xml/document/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/xml/document/CMakeLists.linux.txt b/library/cpp/xml/document/CMakeLists.linux-x86_64.txt
index b746771536..b746771536 100644
--- a/library/cpp/xml/document/CMakeLists.linux.txt
+++ b/library/cpp/xml/document/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/xml/document/CMakeLists.txt b/library/cpp/xml/document/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/xml/document/CMakeLists.txt
+++ b/library/cpp/xml/document/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/xml/init/CMakeLists.darwin.txt b/library/cpp/xml/init/CMakeLists.darwin-x86_64.txt
index 15635507ff..15635507ff 100644
--- a/library/cpp/xml/init/CMakeLists.darwin.txt
+++ b/library/cpp/xml/init/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/xml/init/CMakeLists.linux.txt b/library/cpp/xml/init/CMakeLists.linux-x86_64.txt
index 95ea6cc73c..95ea6cc73c 100644
--- a/library/cpp/xml/init/CMakeLists.linux.txt
+++ b/library/cpp/xml/init/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/xml/init/CMakeLists.txt b/library/cpp/xml/init/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/xml/init/CMakeLists.txt
+++ b/library/cpp/xml/init/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yaml/as/CMakeLists.darwin.txt b/library/cpp/yaml/as/CMakeLists.darwin-x86_64.txt
index 806700a552..806700a552 100644
--- a/library/cpp/yaml/as/CMakeLists.darwin.txt
+++ b/library/cpp/yaml/as/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yaml/as/CMakeLists.linux.txt b/library/cpp/yaml/as/CMakeLists.linux-x86_64.txt
index 50f48acb17..50f48acb17 100644
--- a/library/cpp/yaml/as/CMakeLists.linux.txt
+++ b/library/cpp/yaml/as/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yaml/as/CMakeLists.txt b/library/cpp/yaml/as/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yaml/as/CMakeLists.txt
+++ b/library/cpp/yaml/as/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yaml/fyamlcpp/CMakeLists.darwin.txt b/library/cpp/yaml/fyamlcpp/CMakeLists.darwin-x86_64.txt
index ed89c6d02d..ed89c6d02d 100644
--- a/library/cpp/yaml/fyamlcpp/CMakeLists.darwin.txt
+++ b/library/cpp/yaml/fyamlcpp/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yaml/fyamlcpp/CMakeLists.linux.txt b/library/cpp/yaml/fyamlcpp/CMakeLists.linux-x86_64.txt
index e96ca3e0ec..e96ca3e0ec 100644
--- a/library/cpp/yaml/fyamlcpp/CMakeLists.linux.txt
+++ b/library/cpp/yaml/fyamlcpp/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yaml/fyamlcpp/CMakeLists.txt b/library/cpp/yaml/fyamlcpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yaml/fyamlcpp/CMakeLists.txt
+++ b/library/cpp/yaml/fyamlcpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yson/CMakeLists.darwin.txt b/library/cpp/yson/CMakeLists.darwin-x86_64.txt
index d5cda8e6c0..d5cda8e6c0 100644
--- a/library/cpp/yson/CMakeLists.darwin.txt
+++ b/library/cpp/yson/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yson/CMakeLists.linux.txt b/library/cpp/yson/CMakeLists.linux-x86_64.txt
index 1d4a1bd34e..1d4a1bd34e 100644
--- a/library/cpp/yson/CMakeLists.linux.txt
+++ b/library/cpp/yson/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yson/CMakeLists.txt b/library/cpp/yson/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yson/CMakeLists.txt
+++ b/library/cpp/yson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yson/json/CMakeLists.darwin.txt b/library/cpp/yson/json/CMakeLists.darwin-x86_64.txt
index 2b5efc5d4d..2b5efc5d4d 100644
--- a/library/cpp/yson/json/CMakeLists.darwin.txt
+++ b/library/cpp/yson/json/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yson/json/CMakeLists.linux.txt b/library/cpp/yson/json/CMakeLists.linux-x86_64.txt
index 57dce33310..57dce33310 100644
--- a/library/cpp/yson/json/CMakeLists.linux.txt
+++ b/library/cpp/yson/json/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yson/json/CMakeLists.txt b/library/cpp/yson/json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yson/json/CMakeLists.txt
+++ b/library/cpp/yson/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yson/node/CMakeLists.darwin.txt b/library/cpp/yson/node/CMakeLists.darwin-x86_64.txt
index e9334e323e..e9334e323e 100644
--- a/library/cpp/yson/node/CMakeLists.darwin.txt
+++ b/library/cpp/yson/node/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yson/node/CMakeLists.linux.txt b/library/cpp/yson/node/CMakeLists.linux-x86_64.txt
index ddf918de7f..ddf918de7f 100644
--- a/library/cpp/yson/node/CMakeLists.linux.txt
+++ b/library/cpp/yson/node/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yson/node/CMakeLists.txt b/library/cpp/yson/node/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yson/node/CMakeLists.txt
+++ b/library/cpp/yson/node/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yson_pull/CMakeLists.darwin.txt b/library/cpp/yson_pull/CMakeLists.darwin-x86_64.txt
index a5c4253641..a5c4253641 100644
--- a/library/cpp/yson_pull/CMakeLists.darwin.txt
+++ b/library/cpp/yson_pull/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yson_pull/CMakeLists.linux.txt b/library/cpp/yson_pull/CMakeLists.linux-x86_64.txt
index b634e26c5f..b634e26c5f 100644
--- a/library/cpp/yson_pull/CMakeLists.linux.txt
+++ b/library/cpp/yson_pull/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yson_pull/CMakeLists.txt b/library/cpp/yson_pull/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yson_pull/CMakeLists.txt
+++ b/library/cpp/yson_pull/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/assert/CMakeLists.darwin.txt b/library/cpp/yt/assert/CMakeLists.darwin-x86_64.txt
index c2ad57e3a0..c2ad57e3a0 100644
--- a/library/cpp/yt/assert/CMakeLists.darwin.txt
+++ b/library/cpp/yt/assert/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/assert/CMakeLists.linux.txt b/library/cpp/yt/assert/CMakeLists.linux-x86_64.txt
index 0c4f0dc6c0..0c4f0dc6c0 100644
--- a/library/cpp/yt/assert/CMakeLists.linux.txt
+++ b/library/cpp/yt/assert/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/assert/CMakeLists.txt b/library/cpp/yt/assert/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/assert/CMakeLists.txt
+++ b/library/cpp/yt/assert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/coding/CMakeLists.darwin.txt b/library/cpp/yt/coding/CMakeLists.darwin-x86_64.txt
index ad79d9654f..ad79d9654f 100644
--- a/library/cpp/yt/coding/CMakeLists.darwin.txt
+++ b/library/cpp/yt/coding/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/coding/CMakeLists.linux.txt b/library/cpp/yt/coding/CMakeLists.linux-x86_64.txt
index a2020a68e4..a2020a68e4 100644
--- a/library/cpp/yt/coding/CMakeLists.linux.txt
+++ b/library/cpp/yt/coding/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/coding/CMakeLists.txt b/library/cpp/yt/coding/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/coding/CMakeLists.txt
+++ b/library/cpp/yt/coding/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/exception/CMakeLists.darwin.txt b/library/cpp/yt/exception/CMakeLists.darwin-x86_64.txt
index f40a29467d..f40a29467d 100644
--- a/library/cpp/yt/exception/CMakeLists.darwin.txt
+++ b/library/cpp/yt/exception/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/exception/CMakeLists.linux.txt b/library/cpp/yt/exception/CMakeLists.linux-x86_64.txt
index 780e571ddc..780e571ddc 100644
--- a/library/cpp/yt/exception/CMakeLists.linux.txt
+++ b/library/cpp/yt/exception/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/exception/CMakeLists.txt b/library/cpp/yt/exception/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/exception/CMakeLists.txt
+++ b/library/cpp/yt/exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/malloc/CMakeLists.darwin.txt b/library/cpp/yt/malloc/CMakeLists.darwin-x86_64.txt
index 1d843305d9..1d843305d9 100644
--- a/library/cpp/yt/malloc/CMakeLists.darwin.txt
+++ b/library/cpp/yt/malloc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/malloc/CMakeLists.linux.txt b/library/cpp/yt/malloc/CMakeLists.linux-x86_64.txt
index 40c26cadfb..40c26cadfb 100644
--- a/library/cpp/yt/malloc/CMakeLists.linux.txt
+++ b/library/cpp/yt/malloc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/malloc/CMakeLists.txt b/library/cpp/yt/malloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/malloc/CMakeLists.txt
+++ b/library/cpp/yt/malloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/memory/CMakeLists.darwin.txt b/library/cpp/yt/memory/CMakeLists.darwin-x86_64.txt
index 30fdfbef10..30fdfbef10 100644
--- a/library/cpp/yt/memory/CMakeLists.darwin.txt
+++ b/library/cpp/yt/memory/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/memory/CMakeLists.linux.txt b/library/cpp/yt/memory/CMakeLists.linux-x86_64.txt
index 7325ab2c74..7325ab2c74 100644
--- a/library/cpp/yt/memory/CMakeLists.linux.txt
+++ b/library/cpp/yt/memory/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/memory/CMakeLists.txt b/library/cpp/yt/memory/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/memory/CMakeLists.txt
+++ b/library/cpp/yt/memory/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/misc/CMakeLists.darwin.txt b/library/cpp/yt/misc/CMakeLists.darwin-x86_64.txt
index 92907b63dc..92907b63dc 100644
--- a/library/cpp/yt/misc/CMakeLists.darwin.txt
+++ b/library/cpp/yt/misc/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/misc/CMakeLists.linux.txt b/library/cpp/yt/misc/CMakeLists.linux-x86_64.txt
index 9ed005067b..9ed005067b 100644
--- a/library/cpp/yt/misc/CMakeLists.linux.txt
+++ b/library/cpp/yt/misc/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/misc/CMakeLists.txt b/library/cpp/yt/misc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/misc/CMakeLists.txt
+++ b/library/cpp/yt/misc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/small_containers/CMakeLists.darwin.txt b/library/cpp/yt/small_containers/CMakeLists.darwin-x86_64.txt
index 7f0c283498..7f0c283498 100644
--- a/library/cpp/yt/small_containers/CMakeLists.darwin.txt
+++ b/library/cpp/yt/small_containers/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/small_containers/CMakeLists.linux.txt b/library/cpp/yt/small_containers/CMakeLists.linux-x86_64.txt
index bc2b88bf40..bc2b88bf40 100644
--- a/library/cpp/yt/small_containers/CMakeLists.linux.txt
+++ b/library/cpp/yt/small_containers/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/small_containers/CMakeLists.txt b/library/cpp/yt/small_containers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/small_containers/CMakeLists.txt
+++ b/library/cpp/yt/small_containers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/string/CMakeLists.darwin.txt b/library/cpp/yt/string/CMakeLists.darwin-x86_64.txt
index 77a9e8a268..77a9e8a268 100644
--- a/library/cpp/yt/string/CMakeLists.darwin.txt
+++ b/library/cpp/yt/string/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/string/CMakeLists.linux.txt b/library/cpp/yt/string/CMakeLists.linux-x86_64.txt
index cfafefd2b1..cfafefd2b1 100644
--- a/library/cpp/yt/string/CMakeLists.linux.txt
+++ b/library/cpp/yt/string/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/string/CMakeLists.txt b/library/cpp/yt/string/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/string/CMakeLists.txt
+++ b/library/cpp/yt/string/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/yson/CMakeLists.darwin.txt b/library/cpp/yt/yson/CMakeLists.darwin-x86_64.txt
index 68ae5dcaaf..68ae5dcaaf 100644
--- a/library/cpp/yt/yson/CMakeLists.darwin.txt
+++ b/library/cpp/yt/yson/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/yson/CMakeLists.linux.txt b/library/cpp/yt/yson/CMakeLists.linux-x86_64.txt
index 0aa2b79122..0aa2b79122 100644
--- a/library/cpp/yt/yson/CMakeLists.linux.txt
+++ b/library/cpp/yt/yson/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/yson/CMakeLists.txt b/library/cpp/yt/yson/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/yson/CMakeLists.txt
+++ b/library/cpp/yt/yson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/yt/yson_string/CMakeLists.darwin.txt b/library/cpp/yt/yson_string/CMakeLists.darwin-x86_64.txt
index 31253becd7..31253becd7 100644
--- a/library/cpp/yt/yson_string/CMakeLists.darwin.txt
+++ b/library/cpp/yt/yson_string/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/yt/yson_string/CMakeLists.linux.txt b/library/cpp/yt/yson_string/CMakeLists.linux-x86_64.txt
index 4e3045fc6a..4e3045fc6a 100644
--- a/library/cpp/yt/yson_string/CMakeLists.linux.txt
+++ b/library/cpp/yt/yson_string/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/yt/yson_string/CMakeLists.txt b/library/cpp/yt/yson_string/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/yt/yson_string/CMakeLists.txt
+++ b/library/cpp/yt/yson_string/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/library/cpp/ytalloc/api/CMakeLists.darwin.txt b/library/cpp/ytalloc/api/CMakeLists.darwin-x86_64.txt
index a550e54f00..a550e54f00 100644
--- a/library/cpp/ytalloc/api/CMakeLists.darwin.txt
+++ b/library/cpp/ytalloc/api/CMakeLists.darwin-x86_64.txt
diff --git a/library/cpp/ytalloc/api/CMakeLists.linux.txt b/library/cpp/ytalloc/api/CMakeLists.linux-x86_64.txt
index 3557a63ea8..3557a63ea8 100644
--- a/library/cpp/ytalloc/api/CMakeLists.linux.txt
+++ b/library/cpp/ytalloc/api/CMakeLists.linux-x86_64.txt
diff --git a/library/cpp/ytalloc/api/CMakeLists.txt b/library/cpp/ytalloc/api/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/library/cpp/ytalloc/api/CMakeLists.txt
+++ b/library/cpp/ytalloc/api/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/tools/archiver/CMakeLists.darwin.txt b/tools/archiver/CMakeLists.darwin-x86_64.txt
index d4bc4d4dc1..d4bc4d4dc1 100644
--- a/tools/archiver/CMakeLists.darwin.txt
+++ b/tools/archiver/CMakeLists.darwin-x86_64.txt
diff --git a/tools/archiver/CMakeLists.linux.txt b/tools/archiver/CMakeLists.linux-x86_64.txt
index 398ec59781..398ec59781 100644
--- a/tools/archiver/CMakeLists.linux.txt
+++ b/tools/archiver/CMakeLists.linux-x86_64.txt
diff --git a/tools/archiver/CMakeLists.txt b/tools/archiver/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/tools/archiver/CMakeLists.txt
+++ b/tools/archiver/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/tools/enum_parser/enum_parser/CMakeLists.darwin.txt b/tools/enum_parser/enum_parser/CMakeLists.darwin-x86_64.txt
index 51aa74d9bc..51aa74d9bc 100644
--- a/tools/enum_parser/enum_parser/CMakeLists.darwin.txt
+++ b/tools/enum_parser/enum_parser/CMakeLists.darwin-x86_64.txt
diff --git a/tools/enum_parser/enum_parser/CMakeLists.linux.txt b/tools/enum_parser/enum_parser/CMakeLists.linux-x86_64.txt
index 56e5139b67..56e5139b67 100644
--- a/tools/enum_parser/enum_parser/CMakeLists.linux.txt
+++ b/tools/enum_parser/enum_parser/CMakeLists.linux-x86_64.txt
diff --git a/tools/enum_parser/enum_parser/CMakeLists.txt b/tools/enum_parser/enum_parser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/tools/enum_parser/enum_parser/CMakeLists.txt
+++ b/tools/enum_parser/enum_parser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/tools/enum_parser/enum_serialization_runtime/CMakeLists.darwin.txt b/tools/enum_parser/enum_serialization_runtime/CMakeLists.darwin-x86_64.txt
index ae7cffeb5e..ae7cffeb5e 100644
--- a/tools/enum_parser/enum_serialization_runtime/CMakeLists.darwin.txt
+++ b/tools/enum_parser/enum_serialization_runtime/CMakeLists.darwin-x86_64.txt
diff --git a/tools/enum_parser/enum_serialization_runtime/CMakeLists.linux.txt b/tools/enum_parser/enum_serialization_runtime/CMakeLists.linux-x86_64.txt
index 6ba02c3ad1..6ba02c3ad1 100644
--- a/tools/enum_parser/enum_serialization_runtime/CMakeLists.linux.txt
+++ b/tools/enum_parser/enum_serialization_runtime/CMakeLists.linux-x86_64.txt
diff --git a/tools/enum_parser/enum_serialization_runtime/CMakeLists.txt b/tools/enum_parser/enum_serialization_runtime/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/tools/enum_parser/enum_serialization_runtime/CMakeLists.txt
+++ b/tools/enum_parser/enum_serialization_runtime/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/tools/enum_parser/parse_enum/CMakeLists.darwin.txt b/tools/enum_parser/parse_enum/CMakeLists.darwin-x86_64.txt
index 6facd47e75..6facd47e75 100644
--- a/tools/enum_parser/parse_enum/CMakeLists.darwin.txt
+++ b/tools/enum_parser/parse_enum/CMakeLists.darwin-x86_64.txt
diff --git a/tools/enum_parser/parse_enum/CMakeLists.linux.txt b/tools/enum_parser/parse_enum/CMakeLists.linux-x86_64.txt
index 4798912c9f..4798912c9f 100644
--- a/tools/enum_parser/parse_enum/CMakeLists.linux.txt
+++ b/tools/enum_parser/parse_enum/CMakeLists.linux-x86_64.txt
diff --git a/tools/enum_parser/parse_enum/CMakeLists.txt b/tools/enum_parser/parse_enum/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/tools/enum_parser/parse_enum/CMakeLists.txt
+++ b/tools/enum_parser/parse_enum/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/tools/rescompiler/bin/CMakeLists.darwin.txt b/tools/rescompiler/bin/CMakeLists.darwin-x86_64.txt
index b1222b9e29..b1222b9e29 100644
--- a/tools/rescompiler/bin/CMakeLists.darwin.txt
+++ b/tools/rescompiler/bin/CMakeLists.darwin-x86_64.txt
diff --git a/tools/rescompiler/bin/CMakeLists.linux.txt b/tools/rescompiler/bin/CMakeLists.linux-x86_64.txt
index 6fa1888e8f..6fa1888e8f 100644
--- a/tools/rescompiler/bin/CMakeLists.linux.txt
+++ b/tools/rescompiler/bin/CMakeLists.linux-x86_64.txt
diff --git a/tools/rescompiler/bin/CMakeLists.txt b/tools/rescompiler/bin/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/tools/rescompiler/bin/CMakeLists.txt
+++ b/tools/rescompiler/bin/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/util/CMakeLists.darwin.txt b/util/CMakeLists.darwin-x86_64.txt
index e53ac46034..e53ac46034 100644
--- a/util/CMakeLists.darwin.txt
+++ b/util/CMakeLists.darwin-x86_64.txt
diff --git a/util/CMakeLists.linux.txt b/util/CMakeLists.linux-x86_64.txt
index 1d248a682d..1d248a682d 100644
--- a/util/CMakeLists.linux.txt
+++ b/util/CMakeLists.linux-x86_64.txt
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/util/CMakeLists.txt
+++ b/util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/util/charset/CMakeLists.darwin.txt b/util/charset/CMakeLists.darwin-x86_64.txt
index b63f9cf047..b63f9cf047 100644
--- a/util/charset/CMakeLists.darwin.txt
+++ b/util/charset/CMakeLists.darwin-x86_64.txt
diff --git a/util/charset/CMakeLists.linux.txt b/util/charset/CMakeLists.linux-x86_64.txt
index 79398a4034..79398a4034 100644
--- a/util/charset/CMakeLists.linux.txt
+++ b/util/charset/CMakeLists.linux-x86_64.txt
diff --git a/util/charset/CMakeLists.txt b/util/charset/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/util/charset/CMakeLists.txt
+++ b/util/charset/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/util/draft/CMakeLists.darwin.txt b/util/draft/CMakeLists.darwin-x86_64.txt
index 08f23dc394..08f23dc394 100644
--- a/util/draft/CMakeLists.darwin.txt
+++ b/util/draft/CMakeLists.darwin-x86_64.txt
diff --git a/util/draft/CMakeLists.linux.txt b/util/draft/CMakeLists.linux-x86_64.txt
index 7447144d61..7447144d61 100644
--- a/util/draft/CMakeLists.linux.txt
+++ b/util/draft/CMakeLists.linux-x86_64.txt
diff --git a/util/draft/CMakeLists.txt b/util/draft/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/util/draft/CMakeLists.txt
+++ b/util/draft/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/apps/ydb/CMakeLists.darwin.txt b/ydb/apps/ydb/CMakeLists.darwin-x86_64.txt
index 0d29d4f392..0d29d4f392 100644
--- a/ydb/apps/ydb/CMakeLists.darwin.txt
+++ b/ydb/apps/ydb/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/apps/ydb/CMakeLists.linux.txt b/ydb/apps/ydb/CMakeLists.linux-x86_64.txt
index 39aee1cae7..39aee1cae7 100644
--- a/ydb/apps/ydb/CMakeLists.linux.txt
+++ b/ydb/apps/ydb/CMakeLists.linux-x86_64.txt
diff --git a/ydb/apps/ydb/CMakeLists.txt b/ydb/apps/ydb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/apps/ydb/CMakeLists.txt
+++ b/ydb/apps/ydb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/apps/ydb/commands/CMakeLists.darwin.txt b/ydb/apps/ydb/commands/CMakeLists.darwin-x86_64.txt
index e33921e39d..e33921e39d 100644
--- a/ydb/apps/ydb/commands/CMakeLists.darwin.txt
+++ b/ydb/apps/ydb/commands/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/apps/ydb/commands/CMakeLists.linux.txt b/ydb/apps/ydb/commands/CMakeLists.linux-x86_64.txt
index 48b1ad4e47..48b1ad4e47 100644
--- a/ydb/apps/ydb/commands/CMakeLists.linux.txt
+++ b/ydb/apps/ydb/commands/CMakeLists.linux-x86_64.txt
diff --git a/ydb/apps/ydb/commands/CMakeLists.txt b/ydb/apps/ydb/commands/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/apps/ydb/commands/CMakeLists.txt
+++ b/ydb/apps/ydb/commands/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/apps/ydbd/CMakeLists.darwin.txt b/ydb/apps/ydbd/CMakeLists.darwin-x86_64.txt
index afe2304800..afe2304800 100644
--- a/ydb/apps/ydbd/CMakeLists.darwin.txt
+++ b/ydb/apps/ydbd/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/apps/ydbd/CMakeLists.linux.txt b/ydb/apps/ydbd/CMakeLists.linux-x86_64.txt
index 9cc70c525f..9cc70c525f 100644
--- a/ydb/apps/ydbd/CMakeLists.linux.txt
+++ b/ydb/apps/ydbd/CMakeLists.linux-x86_64.txt
diff --git a/ydb/apps/ydbd/CMakeLists.txt b/ydb/apps/ydbd/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/apps/ydbd/CMakeLists.txt
+++ b/ydb/apps/ydbd/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/actorlib_impl/CMakeLists.darwin.txt b/ydb/core/actorlib_impl/CMakeLists.darwin-x86_64.txt
index 3bb8e6dd5d..3bb8e6dd5d 100644
--- a/ydb/core/actorlib_impl/CMakeLists.darwin.txt
+++ b/ydb/core/actorlib_impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/actorlib_impl/CMakeLists.linux.txt b/ydb/core/actorlib_impl/CMakeLists.linux-x86_64.txt
index 4a5c4eb794..4a5c4eb794 100644
--- a/ydb/core/actorlib_impl/CMakeLists.linux.txt
+++ b/ydb/core/actorlib_impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/actorlib_impl/CMakeLists.txt b/ydb/core/actorlib_impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/actorlib_impl/CMakeLists.txt
+++ b/ydb/core/actorlib_impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/actorlib_impl/ut/CMakeLists.darwin.txt b/ydb/core/actorlib_impl/ut/CMakeLists.darwin-x86_64.txt
index bda2e67099..bda2e67099 100644
--- a/ydb/core/actorlib_impl/ut/CMakeLists.darwin.txt
+++ b/ydb/core/actorlib_impl/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/actorlib_impl/ut/CMakeLists.linux.txt b/ydb/core/actorlib_impl/ut/CMakeLists.linux-x86_64.txt
index 34f85bdba6..34f85bdba6 100644
--- a/ydb/core/actorlib_impl/ut/CMakeLists.linux.txt
+++ b/ydb/core/actorlib_impl/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/actorlib_impl/ut/CMakeLists.txt b/ydb/core/actorlib_impl/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/actorlib_impl/ut/CMakeLists.txt
+++ b/ydb/core/actorlib_impl/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/audit/CMakeLists.darwin.txt b/ydb/core/audit/CMakeLists.darwin-x86_64.txt
index 82fbe61796..82fbe61796 100644
--- a/ydb/core/audit/CMakeLists.darwin.txt
+++ b/ydb/core/audit/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/audit/CMakeLists.linux.txt b/ydb/core/audit/CMakeLists.linux-x86_64.txt
index a2eac3443c..a2eac3443c 100644
--- a/ydb/core/audit/CMakeLists.linux.txt
+++ b/ydb/core/audit/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/audit/CMakeLists.txt b/ydb/core/audit/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/audit/CMakeLists.txt
+++ b/ydb/core/audit/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/base/CMakeLists.darwin.txt b/ydb/core/base/CMakeLists.darwin-x86_64.txt
index bef496eecc..bef496eecc 100644
--- a/ydb/core/base/CMakeLists.darwin.txt
+++ b/ydb/core/base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/base/CMakeLists.linux.txt b/ydb/core/base/CMakeLists.linux-x86_64.txt
index c66927f294..c66927f294 100644
--- a/ydb/core/base/CMakeLists.linux.txt
+++ b/ydb/core/base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/base/CMakeLists.txt b/ydb/core/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/base/CMakeLists.txt
+++ b/ydb/core/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/base/services/CMakeLists.darwin.txt b/ydb/core/base/services/CMakeLists.darwin-x86_64.txt
index 0ae59a25de..0ae59a25de 100644
--- a/ydb/core/base/services/CMakeLists.darwin.txt
+++ b/ydb/core/base/services/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/base/services/CMakeLists.linux.txt b/ydb/core/base/services/CMakeLists.linux-x86_64.txt
index 4fa1eca5ef..4fa1eca5ef 100644
--- a/ydb/core/base/services/CMakeLists.linux.txt
+++ b/ydb/core/base/services/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/base/services/CMakeLists.txt b/ydb/core/base/services/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/base/services/CMakeLists.txt
+++ b/ydb/core/base/services/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/base/ut/CMakeLists.darwin.txt b/ydb/core/base/ut/CMakeLists.darwin-x86_64.txt
index d68838d828..d68838d828 100644
--- a/ydb/core/base/ut/CMakeLists.darwin.txt
+++ b/ydb/core/base/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/base/ut/CMakeLists.linux.txt b/ydb/core/base/ut/CMakeLists.linux-x86_64.txt
index e53bddf016..e53bddf016 100644
--- a/ydb/core/base/ut/CMakeLists.linux.txt
+++ b/ydb/core/base/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/base/ut/CMakeLists.txt b/ydb/core/base/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/base/ut/CMakeLists.txt
+++ b/ydb/core/base/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blob_depot/CMakeLists.darwin.txt b/ydb/core/blob_depot/CMakeLists.darwin-x86_64.txt
index 601a05c08f..601a05c08f 100644
--- a/ydb/core/blob_depot/CMakeLists.darwin.txt
+++ b/ydb/core/blob_depot/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blob_depot/CMakeLists.linux.txt b/ydb/core/blob_depot/CMakeLists.linux-x86_64.txt
index e12fd5266e..e12fd5266e 100644
--- a/ydb/core/blob_depot/CMakeLists.linux.txt
+++ b/ydb/core/blob_depot/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blob_depot/CMakeLists.txt b/ydb/core/blob_depot/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blob_depot/CMakeLists.txt
+++ b/ydb/core/blob_depot/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blob_depot/agent/CMakeLists.darwin.txt b/ydb/core/blob_depot/agent/CMakeLists.darwin-x86_64.txt
index c18d69d6cf..c18d69d6cf 100644
--- a/ydb/core/blob_depot/agent/CMakeLists.darwin.txt
+++ b/ydb/core/blob_depot/agent/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blob_depot/agent/CMakeLists.linux.txt b/ydb/core/blob_depot/agent/CMakeLists.linux-x86_64.txt
index 37da1726ef..37da1726ef 100644
--- a/ydb/core/blob_depot/agent/CMakeLists.linux.txt
+++ b/ydb/core/blob_depot/agent/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blob_depot/agent/CMakeLists.txt b/ydb/core/blob_depot/agent/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blob_depot/agent/CMakeLists.txt
+++ b/ydb/core/blob_depot/agent/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blob_depot/ut/CMakeLists.darwin.txt b/ydb/core/blob_depot/ut/CMakeLists.darwin-x86_64.txt
index c1c07fd82c..c1c07fd82c 100644
--- a/ydb/core/blob_depot/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blob_depot/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blob_depot/ut/CMakeLists.linux.txt b/ydb/core/blob_depot/ut/CMakeLists.linux-x86_64.txt
index 284e9732b5..284e9732b5 100644
--- a/ydb/core/blob_depot/ut/CMakeLists.linux.txt
+++ b/ydb/core/blob_depot/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blob_depot/ut/CMakeLists.txt b/ydb/core/blob_depot/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blob_depot/ut/CMakeLists.txt
+++ b/ydb/core/blob_depot/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/CMakeLists.darwin.txt b/ydb/core/blobstorage/CMakeLists.darwin-x86_64.txt
index 68b0f9d3f5..68b0f9d3f5 100644
--- a/ydb/core/blobstorage/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/CMakeLists.linux.txt b/ydb/core/blobstorage/CMakeLists.linux-x86_64.txt
index 93d433b2b5..93d433b2b5 100644
--- a/ydb/core/blobstorage/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/CMakeLists.txt b/ydb/core/blobstorage/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/CMakeLists.txt
+++ b/ydb/core/blobstorage/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/backpressure/CMakeLists.darwin.txt b/ydb/core/blobstorage/backpressure/CMakeLists.darwin-x86_64.txt
index 720dc8da9c..720dc8da9c 100644
--- a/ydb/core/blobstorage/backpressure/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/backpressure/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/backpressure/CMakeLists.linux.txt b/ydb/core/blobstorage/backpressure/CMakeLists.linux-x86_64.txt
index 2eab395ad0..2eab395ad0 100644
--- a/ydb/core/blobstorage/backpressure/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/backpressure/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/backpressure/CMakeLists.txt b/ydb/core/blobstorage/backpressure/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/backpressure/CMakeLists.txt
+++ b/ydb/core/blobstorage/backpressure/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/backpressure/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/backpressure/ut/CMakeLists.darwin-x86_64.txt
index bfd628cfab..bfd628cfab 100644
--- a/ydb/core/blobstorage/backpressure/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/backpressure/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/backpressure/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/backpressure/ut/CMakeLists.linux-x86_64.txt
index 01bbd84e65..01bbd84e65 100644
--- a/ydb/core/blobstorage/backpressure/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/backpressure/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/backpressure/ut/CMakeLists.txt b/ydb/core/blobstorage/backpressure/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/backpressure/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/backpressure/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.darwin.txt b/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.darwin-x86_64.txt
index 05db278101..05db278101 100644
--- a/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.linux.txt b/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.linux-x86_64.txt
index c6798be4dd..c6798be4dd 100644
--- a/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.txt b/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.txt
+++ b/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/base/CMakeLists.darwin.txt b/ydb/core/blobstorage/base/CMakeLists.darwin-x86_64.txt
index be525087d9..be525087d9 100644
--- a/ydb/core/blobstorage/base/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/base/CMakeLists.linux.txt b/ydb/core/blobstorage/base/CMakeLists.linux-x86_64.txt
index 51c682e7bb..51c682e7bb 100644
--- a/ydb/core/blobstorage/base/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/base/CMakeLists.txt b/ydb/core/blobstorage/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/base/CMakeLists.txt
+++ b/ydb/core/blobstorage/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/base/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/base/ut/CMakeLists.darwin-x86_64.txt
index daaf80f4ca..daaf80f4ca 100644
--- a/ydb/core/blobstorage/base/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/base/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/base/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/base/ut/CMakeLists.linux-x86_64.txt
index d4d56adf6d..d4d56adf6d 100644
--- a/ydb/core/blobstorage/base/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/base/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/base/ut/CMakeLists.txt b/ydb/core/blobstorage/base/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/base/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/base/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/crypto/CMakeLists.darwin.txt b/ydb/core/blobstorage/crypto/CMakeLists.darwin-x86_64.txt
index 8ab893781a..8ab893781a 100644
--- a/ydb/core/blobstorage/crypto/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/crypto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/crypto/CMakeLists.linux.txt b/ydb/core/blobstorage/crypto/CMakeLists.linux-x86_64.txt
index 2b7e0540c5..2b7e0540c5 100644
--- a/ydb/core/blobstorage/crypto/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/crypto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/crypto/CMakeLists.txt b/ydb/core/blobstorage/crypto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/crypto/CMakeLists.txt
+++ b/ydb/core/blobstorage/crypto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/crypto/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/crypto/ut/CMakeLists.darwin-x86_64.txt
index c8aad33cf2..c8aad33cf2 100644
--- a/ydb/core/blobstorage/crypto/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/crypto/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/crypto/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/crypto/ut/CMakeLists.linux-x86_64.txt
index 0e6f16e183..0e6f16e183 100644
--- a/ydb/core/blobstorage/crypto/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/crypto/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/crypto/ut/CMakeLists.txt b/ydb/core/blobstorage/crypto/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/crypto/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/crypto/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/dsproxy/CMakeLists.darwin.txt b/ydb/core/blobstorage/dsproxy/CMakeLists.darwin-x86_64.txt
index 3a0d583d7e..3a0d583d7e 100644
--- a/ydb/core/blobstorage/dsproxy/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/dsproxy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/dsproxy/CMakeLists.linux.txt b/ydb/core/blobstorage/dsproxy/CMakeLists.linux-x86_64.txt
index 761cb66fcc..761cb66fcc 100644
--- a/ydb/core/blobstorage/dsproxy/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/dsproxy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/dsproxy/CMakeLists.txt b/ydb/core/blobstorage/dsproxy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/dsproxy/CMakeLists.txt
+++ b/ydb/core/blobstorage/dsproxy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/dsproxy/mock/CMakeLists.darwin.txt b/ydb/core/blobstorage/dsproxy/mock/CMakeLists.darwin-x86_64.txt
index 52990414c9..52990414c9 100644
--- a/ydb/core/blobstorage/dsproxy/mock/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/dsproxy/mock/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/dsproxy/mock/CMakeLists.linux.txt b/ydb/core/blobstorage/dsproxy/mock/CMakeLists.linux-x86_64.txt
index a8ae37f8d2..a8ae37f8d2 100644
--- a/ydb/core/blobstorage/dsproxy/mock/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/dsproxy/mock/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/dsproxy/mock/CMakeLists.txt b/ydb/core/blobstorage/dsproxy/mock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/dsproxy/mock/CMakeLists.txt
+++ b/ydb/core/blobstorage/dsproxy/mock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/dsproxy/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/dsproxy/ut/CMakeLists.darwin-x86_64.txt
index 7135720239..7135720239 100644
--- a/ydb/core/blobstorage/dsproxy/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/dsproxy/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/dsproxy/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/dsproxy/ut/CMakeLists.linux-x86_64.txt
index bcdc889119..bcdc889119 100644
--- a/ydb/core/blobstorage/dsproxy/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/dsproxy/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/dsproxy/ut/CMakeLists.txt b/ydb/core/blobstorage/dsproxy/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/dsproxy/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/dsproxy/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.darwin.txt b/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.darwin-x86_64.txt
index 03cc07ea87..03cc07ea87 100644
--- a/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.linux.txt b/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.linux-x86_64.txt
index 50053ec49e..50053ec49e 100644
--- a/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.txt b/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.txt
+++ b/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/groupinfo/CMakeLists.darwin.txt b/ydb/core/blobstorage/groupinfo/CMakeLists.darwin-x86_64.txt
index 21ff4fac3c..21ff4fac3c 100644
--- a/ydb/core/blobstorage/groupinfo/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/groupinfo/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/groupinfo/CMakeLists.linux.txt b/ydb/core/blobstorage/groupinfo/CMakeLists.linux-x86_64.txt
index 606cbf49d9..606cbf49d9 100644
--- a/ydb/core/blobstorage/groupinfo/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/groupinfo/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/groupinfo/CMakeLists.txt b/ydb/core/blobstorage/groupinfo/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/groupinfo/CMakeLists.txt
+++ b/ydb/core/blobstorage/groupinfo/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/groupinfo/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/groupinfo/ut/CMakeLists.darwin-x86_64.txt
index 3cc51cf347..3cc51cf347 100644
--- a/ydb/core/blobstorage/groupinfo/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/groupinfo/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/groupinfo/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/groupinfo/ut/CMakeLists.linux-x86_64.txt
index 4646f3e58d..4646f3e58d 100644
--- a/ydb/core/blobstorage/groupinfo/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/groupinfo/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/groupinfo/ut/CMakeLists.txt b/ydb/core/blobstorage/groupinfo/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/groupinfo/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/groupinfo/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/incrhuge/CMakeLists.darwin.txt b/ydb/core/blobstorage/incrhuge/CMakeLists.darwin-x86_64.txt
index 25ce270b59..25ce270b59 100644
--- a/ydb/core/blobstorage/incrhuge/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/incrhuge/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/incrhuge/CMakeLists.linux.txt b/ydb/core/blobstorage/incrhuge/CMakeLists.linux-x86_64.txt
index 5b78d857a5..5b78d857a5 100644
--- a/ydb/core/blobstorage/incrhuge/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/incrhuge/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/incrhuge/CMakeLists.txt b/ydb/core/blobstorage/incrhuge/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/incrhuge/CMakeLists.txt
+++ b/ydb/core/blobstorage/incrhuge/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/incrhuge/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/incrhuge/ut/CMakeLists.darwin-x86_64.txt
index 05e64c03cd..05e64c03cd 100644
--- a/ydb/core/blobstorage/incrhuge/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/incrhuge/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/incrhuge/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/incrhuge/ut/CMakeLists.linux-x86_64.txt
index ed9bf6e440..ed9bf6e440 100644
--- a/ydb/core/blobstorage/incrhuge/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/incrhuge/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/incrhuge/ut/CMakeLists.txt b/ydb/core/blobstorage/incrhuge/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/incrhuge/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/incrhuge/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/lwtrace_probes/CMakeLists.darwin.txt b/ydb/core/blobstorage/lwtrace_probes/CMakeLists.darwin-x86_64.txt
index 0594957b5e..0594957b5e 100644
--- a/ydb/core/blobstorage/lwtrace_probes/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/lwtrace_probes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/lwtrace_probes/CMakeLists.linux.txt b/ydb/core/blobstorage/lwtrace_probes/CMakeLists.linux-x86_64.txt
index 1858621a0f..1858621a0f 100644
--- a/ydb/core/blobstorage/lwtrace_probes/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/lwtrace_probes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/lwtrace_probes/CMakeLists.txt b/ydb/core/blobstorage/lwtrace_probes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/lwtrace_probes/CMakeLists.txt
+++ b/ydb/core/blobstorage/lwtrace_probes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/nodewarden/CMakeLists.darwin.txt b/ydb/core/blobstorage/nodewarden/CMakeLists.darwin-x86_64.txt
index c149b101bd..c149b101bd 100644
--- a/ydb/core/blobstorage/nodewarden/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/nodewarden/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/nodewarden/CMakeLists.linux.txt b/ydb/core/blobstorage/nodewarden/CMakeLists.linux-x86_64.txt
index a476425344..a476425344 100644
--- a/ydb/core/blobstorage/nodewarden/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/nodewarden/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/nodewarden/CMakeLists.txt b/ydb/core/blobstorage/nodewarden/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/nodewarden/CMakeLists.txt
+++ b/ydb/core/blobstorage/nodewarden/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/nodewarden/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/nodewarden/ut/CMakeLists.darwin-x86_64.txt
index be93d4d928..be93d4d928 100644
--- a/ydb/core/blobstorage/nodewarden/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/nodewarden/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/nodewarden/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/nodewarden/ut/CMakeLists.linux-x86_64.txt
index 07c2d8aaf4..07c2d8aaf4 100644
--- a/ydb/core/blobstorage/nodewarden/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/nodewarden/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/nodewarden/ut/CMakeLists.txt b/ydb/core/blobstorage/nodewarden/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/nodewarden/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/nodewarden/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.darwin.txt b/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.darwin-x86_64.txt
index efe3d0b3c5..efe3d0b3c5 100644
--- a/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.linux.txt b/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.linux-x86_64.txt
index 784e5d05c4..784e5d05c4 100644
--- a/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.txt b/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.txt
+++ b/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/other/CMakeLists.darwin.txt b/ydb/core/blobstorage/other/CMakeLists.darwin-x86_64.txt
index c4b1102523..c4b1102523 100644
--- a/ydb/core/blobstorage/other/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/other/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/other/CMakeLists.linux.txt b/ydb/core/blobstorage/other/CMakeLists.linux-x86_64.txt
index 0cba04d287..0cba04d287 100644
--- a/ydb/core/blobstorage/other/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/other/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/other/CMakeLists.txt b/ydb/core/blobstorage/other/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/other/CMakeLists.txt
+++ b/ydb/core/blobstorage/other/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/pdisk/CMakeLists.darwin.txt b/ydb/core/blobstorage/pdisk/CMakeLists.darwin-x86_64.txt
index 378ee76176..378ee76176 100644
--- a/ydb/core/blobstorage/pdisk/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/pdisk/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/pdisk/CMakeLists.linux.txt b/ydb/core/blobstorage/pdisk/CMakeLists.linux-x86_64.txt
index 1fd378a19b..1fd378a19b 100644
--- a/ydb/core/blobstorage/pdisk/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/pdisk/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/pdisk/CMakeLists.txt b/ydb/core/blobstorage/pdisk/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/pdisk/CMakeLists.txt
+++ b/ydb/core/blobstorage/pdisk/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/pdisk/mock/CMakeLists.darwin.txt b/ydb/core/blobstorage/pdisk/mock/CMakeLists.darwin-x86_64.txt
index 54958ea9c9..54958ea9c9 100644
--- a/ydb/core/blobstorage/pdisk/mock/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/pdisk/mock/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/pdisk/mock/CMakeLists.linux.txt b/ydb/core/blobstorage/pdisk/mock/CMakeLists.linux-x86_64.txt
index b42ddb6193..b42ddb6193 100644
--- a/ydb/core/blobstorage/pdisk/mock/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/pdisk/mock/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/pdisk/mock/CMakeLists.txt b/ydb/core/blobstorage/pdisk/mock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/pdisk/mock/CMakeLists.txt
+++ b/ydb/core/blobstorage/pdisk/mock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/pdisk/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/pdisk/ut/CMakeLists.darwin-x86_64.txt
index 0bf4ffde6d..0bf4ffde6d 100644
--- a/ydb/core/blobstorage/pdisk/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/pdisk/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/pdisk/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/pdisk/ut/CMakeLists.linux-x86_64.txt
index b9757c9cad..b9757c9cad 100644
--- a/ydb/core/blobstorage/pdisk/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/pdisk/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/pdisk/ut/CMakeLists.txt b/ydb/core/blobstorage/pdisk/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/pdisk/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/pdisk/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/storagepoolmon/CMakeLists.darwin.txt b/ydb/core/blobstorage/storagepoolmon/CMakeLists.darwin-x86_64.txt
index d5c1a02d8f..d5c1a02d8f 100644
--- a/ydb/core/blobstorage/storagepoolmon/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/storagepoolmon/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/storagepoolmon/CMakeLists.linux.txt b/ydb/core/blobstorage/storagepoolmon/CMakeLists.linux-x86_64.txt
index ccd7e3d891..ccd7e3d891 100644
--- a/ydb/core/blobstorage/storagepoolmon/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/storagepoolmon/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/storagepoolmon/CMakeLists.txt b/ydb/core/blobstorage/storagepoolmon/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/storagepoolmon/CMakeLists.txt
+++ b/ydb/core/blobstorage/storagepoolmon/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.darwin-x86_64.txt
index c7b2cf5c69..c7b2cf5c69 100644
--- a/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.linux-x86_64.txt
index d34fc4953d..d34fc4953d 100644
--- a/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.txt b/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/testing/group_overseer/CMakeLists.darwin.txt b/ydb/core/blobstorage/testing/group_overseer/CMakeLists.darwin-x86_64.txt
index 65ce705be6..65ce705be6 100644
--- a/ydb/core/blobstorage/testing/group_overseer/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/testing/group_overseer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/testing/group_overseer/CMakeLists.linux.txt b/ydb/core/blobstorage/testing/group_overseer/CMakeLists.linux-x86_64.txt
index 372c18f418..372c18f418 100644
--- a/ydb/core/blobstorage/testing/group_overseer/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/testing/group_overseer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/testing/group_overseer/CMakeLists.txt b/ydb/core/blobstorage/testing/group_overseer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/testing/group_overseer/CMakeLists.txt
+++ b/ydb/core/blobstorage/testing/group_overseer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin-x86_64.txt
index 0d2a66e5aa..0d2a66e5aa 100644
--- a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux-x86_64.txt
index 96fec7bf6a..96fec7bf6a 100644
--- a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.darwin-x86_64.txt
index ad3a4d2e09..ad3a4d2e09 100644
--- a/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.linux-x86_64.txt
index 7bdff9b65a..7bdff9b65a 100644
--- a/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.darwin-x86_64.txt
index 3a89a435c5..3a89a435c5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.linux-x86_64.txt
index 513fdcb22a..513fdcb22a 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.darwin-x86_64.txt
index 0400232ea1..0400232ea1 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.linux-x86_64.txt
index 31981ce635..31981ce635 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.darwin-x86_64.txt
index f86dbf529e..f86dbf529e 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.linux-x86_64.txt
index 30dbc50e56..30dbc50e56 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.darwin-x86_64.txt
index ca0d9f4ad8..ca0d9f4ad8 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.linux-x86_64.txt
index 84fcb84dc4..84fcb84dc4 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.darwin-x86_64.txt
index c3055be15b..c3055be15b 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.linux-x86_64.txt
index 78f1bc525d..78f1bc525d 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.darwin-x86_64.txt
index 0be623c276..0be623c276 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.linux-x86_64.txt
index 14132a6af2..14132a6af2 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.darwin-x86_64.txt
index 2e90ec50b9..2e90ec50b9 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.linux-x86_64.txt
index fcab171034..fcab171034 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_group/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_group/CMakeLists.darwin-x86_64.txt
index 781c565693..781c565693 100644
--- a/ydb/core/blobstorage/ut_group/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_group/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_group/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_group/CMakeLists.linux-x86_64.txt
index 61ef2c450d..61ef2c450d 100644
--- a/ydb/core/blobstorage/ut_group/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_group/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_group/CMakeLists.txt b/ydb/core/blobstorage/ut_group/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_group/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_group/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.darwin-x86_64.txt
index bfeef5f34e..bfeef5f34e 100644
--- a/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.linux-x86_64.txt
index bd5bbe20d5..bd5bbe20d5 100644
--- a/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.txt b/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.darwin-x86_64.txt
index ea6c677000..ea6c677000 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.linux-x86_64.txt
index 1411ab1a64..1411ab1a64 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.txt b/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.darwin-x86_64.txt
index 3daf2d8ca5..3daf2d8ca5 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.linux-x86_64.txt
index d06f8df533..d06f8df533 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.txt b/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.linux-x86_64.txt
index deba76a9c3..deba76a9c3 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.txt b/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.linux-x86_64.txt
index 4c94c1dbbb..4c94c1dbbb 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.txt b/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.txt
index ba630c0cc4..4349073206 100644
--- a/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.txt
@@ -9,5 +9,5 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_testshard/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_testshard/CMakeLists.darwin-x86_64.txt
index ed0479c566..ed0479c566 100644
--- a/ydb/core/blobstorage/ut_testshard/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_testshard/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_testshard/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_testshard/CMakeLists.linux-x86_64.txt
index 1d0fcaec38..1d0fcaec38 100644
--- a/ydb/core/blobstorage/ut_testshard/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_testshard/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_testshard/CMakeLists.txt b/ydb/core/blobstorage/ut_testshard/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_testshard/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_testshard/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_vdisk/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_vdisk/CMakeLists.darwin-x86_64.txt
index 7df629b15f..7df629b15f 100644
--- a/ydb/core/blobstorage/ut_vdisk/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_vdisk/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_vdisk/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_vdisk/CMakeLists.linux-x86_64.txt
index e8efc076e3..e8efc076e3 100644
--- a/ydb/core/blobstorage/ut_vdisk/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_vdisk/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_vdisk/CMakeLists.txt b/ydb/core/blobstorage/ut_vdisk/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_vdisk/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_vdisk/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.darwin-x86_64.txt
index 68d858a578..68d858a578 100644
--- a/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.linux-x86_64.txt
index 0fe8358c6a..0fe8358c6a 100644
--- a/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.txt b/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_vdisk/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/ut_vdisk2/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_vdisk2/CMakeLists.darwin-x86_64.txt
index 0301c20583..0301c20583 100644
--- a/ydb/core/blobstorage/ut_vdisk2/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/ut_vdisk2/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_vdisk2/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_vdisk2/CMakeLists.linux-x86_64.txt
index f927e067ce..f927e067ce 100644
--- a/ydb/core/blobstorage/ut_vdisk2/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/ut_vdisk2/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/ut_vdisk2/CMakeLists.txt b/ydb/core/blobstorage/ut_vdisk2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/ut_vdisk2/CMakeLists.txt
+++ b/ydb/core/blobstorage/ut_vdisk2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/CMakeLists.darwin-x86_64.txt
index 2632812048..2632812048 100644
--- a/ydb/core/blobstorage/vdisk/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/CMakeLists.linux-x86_64.txt
index 9428ff308e..9428ff308e 100644
--- a/ydb/core/blobstorage/vdisk/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/CMakeLists.txt b/ydb/core/blobstorage/vdisk/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.darwin-x86_64.txt
index cf20eaa1b5..cf20eaa1b5 100644
--- a/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.linux-x86_64.txt
index 61a0b43247..61a0b43247 100644
--- a/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.txt b/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/anubis_osiris/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.darwin-x86_64.txt
index f1458a7b52..f1458a7b52 100644
--- a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.linux-x86_64.txt
index c453a1edb1..c453a1edb1 100644
--- a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/common/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/common/CMakeLists.darwin-x86_64.txt
index ad4318a302..ad4318a302 100644
--- a/ydb/core/blobstorage/vdisk/common/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/common/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/common/CMakeLists.linux-x86_64.txt
index f0551fda25..f0551fda25 100644
--- a/ydb/core/blobstorage/vdisk/common/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/common/CMakeLists.txt b/ydb/core/blobstorage/vdisk/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/common/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.darwin-x86_64.txt
index cacf51b350..cacf51b350 100644
--- a/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.linux-x86_64.txt
index 49306bc945..49306bc945 100644
--- a/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/defrag/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/defrag/CMakeLists.darwin-x86_64.txt
index 7e3b60a434..7e3b60a434 100644
--- a/ydb/core/blobstorage/vdisk/defrag/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/defrag/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/defrag/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/defrag/CMakeLists.linux-x86_64.txt
index 8bef9d5b29..8bef9d5b29 100644
--- a/ydb/core/blobstorage/vdisk/defrag/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/defrag/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/defrag/CMakeLists.txt b/ydb/core/blobstorage/vdisk/defrag/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/defrag/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/defrag/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.darwin-x86_64.txt
index 5f981fc02b..5f981fc02b 100644
--- a/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.linux-x86_64.txt
index cc1dd88a82..cc1dd88a82 100644
--- a/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/handoff/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/handoff/CMakeLists.darwin-x86_64.txt
index 03db99f5d4..03db99f5d4 100644
--- a/ydb/core/blobstorage/vdisk/handoff/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/handoff/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/handoff/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/handoff/CMakeLists.linux-x86_64.txt
index 2a4b4a38bd..2a4b4a38bd 100644
--- a/ydb/core/blobstorage/vdisk/handoff/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/handoff/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/handoff/CMakeLists.txt b/ydb/core/blobstorage/vdisk/handoff/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/handoff/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/handoff/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/huge/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/huge/CMakeLists.darwin-x86_64.txt
index 589355bf84..589355bf84 100644
--- a/ydb/core/blobstorage/vdisk/huge/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/huge/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/huge/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/huge/CMakeLists.linux-x86_64.txt
index 00d7bccd97..00d7bccd97 100644
--- a/ydb/core/blobstorage/vdisk/huge/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/huge/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/huge/CMakeLists.txt b/ydb/core/blobstorage/vdisk/huge/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/huge/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/huge/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.darwin-x86_64.txt
index 5561c48fa8..5561c48fa8 100644
--- a/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.linux-x86_64.txt
index f97f0d1fbd..f97f0d1fbd 100644
--- a/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.darwin-x86_64.txt
index 880fd7ff67..880fd7ff67 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.linux-x86_64.txt
index 0774dd133f..0774dd133f 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.darwin-x86_64.txt
index 4a479fb693..4a479fb693 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.linux-x86_64.txt
index 0d1e933972..0d1e933972 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.darwin-x86_64.txt
index 7b235ca689..7b235ca689 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.linux-x86_64.txt
index e41509a78f..e41509a78f 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.darwin-x86_64.txt
index 6db91dc19d..6db91dc19d 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.linux-x86_64.txt
index ca7e9fc114..ca7e9fc114 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.darwin-x86_64.txt
index 2ca53da55f..2ca53da55f 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.linux-x86_64.txt
index ec3cfb7afc..ec3cfb7afc 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.darwin-x86_64.txt
index 24bf99401f..24bf99401f 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.linux-x86_64.txt
index f9372dcb37..f9372dcb37 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/bulksst_add/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.darwin-x86_64.txt
index ec5aa8425b..ec5aa8425b 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.linux-x86_64.txt
index 28673a5025..28673a5025 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.darwin-x86_64.txt
index 6c0003e00c..6c0003e00c 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.linux-x86_64.txt
index db0d7f99c9..db0d7f99c9 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.darwin-x86_64.txt
index 7c9fa1b947..7c9fa1b947 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.linux-x86_64.txt
index cf6ffe3ed4..cf6ffe3ed4 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/compstrat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.darwin-x86_64.txt
index c00fcd3b07..c00fcd3b07 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.linux-x86_64.txt
index ef4dc6b054..ef4dc6b054 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.darwin-x86_64.txt
index c43891962e..c43891962e 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.linux-x86_64.txt
index b941123444..b941123444 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.darwin-x86_64.txt
index b1791b3fba..b1791b3fba 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.linux-x86_64.txt
index 982d9742b2..982d9742b2 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.darwin-x86_64.txt
index ff0ea8a96c..ff0ea8a96c 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.linux-x86_64.txt
index d29505f4b9..d29505f4b9 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.darwin-x86_64.txt
index 7456dd9455..7456dd9455 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.linux-x86_64.txt
index 84177df987..84177df987 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.darwin-x86_64.txt
index 50e400c525..50e400c525 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.linux-x86_64.txt
index cad216c5d3..cad216c5d3 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/recovery/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.darwin-x86_64.txt
index 279e7bdb8f..279e7bdb8f 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.linux-x86_64.txt
index ec53987ef5..ec53987ef5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/test/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hullop/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hullop/CMakeLists.darwin-x86_64.txt
index 525fefdd9a..525fefdd9a 100644
--- a/ydb/core/blobstorage/vdisk/hullop/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hullop/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hullop/CMakeLists.linux-x86_64.txt
index c96aa5c052..c96aa5c052 100644
--- a/ydb/core/blobstorage/vdisk/hullop/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hullop/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hullop/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hullop/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.darwin-x86_64.txt
index 9c6c88c18a..9c6c88c18a 100644
--- a/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.linux-x86_64.txt
index 4bb7d46213..4bb7d46213 100644
--- a/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/hullcompdelete/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.darwin-x86_64.txt
index 304172081c..304172081c 100644
--- a/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.linux-x86_64.txt
index 249171c2b9..249171c2b9 100644
--- a/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/ingress/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/ingress/CMakeLists.darwin-x86_64.txt
index 097ee5fb7f..097ee5fb7f 100644
--- a/ydb/core/blobstorage/vdisk/ingress/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/ingress/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/ingress/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/ingress/CMakeLists.linux-x86_64.txt
index 289d40aed8..289d40aed8 100644
--- a/ydb/core/blobstorage/vdisk/ingress/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/ingress/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/ingress/CMakeLists.txt b/ydb/core/blobstorage/vdisk/ingress/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/ingress/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/ingress/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.darwin-x86_64.txt
index b39c82355f..b39c82355f 100644
--- a/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.linux-x86_64.txt
index 8a0af179fc..8a0af179fc 100644
--- a/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.darwin-x86_64.txt
index 797ce866c9..797ce866c9 100644
--- a/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.linux-x86_64.txt
index 6f01238c28..6f01238c28 100644
--- a/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.txt b/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/localrecovery/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/protos/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/protos/CMakeLists.darwin-x86_64.txt
index 83c328d60b..83c328d60b 100644
--- a/ydb/core/blobstorage/vdisk/protos/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/protos/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/protos/CMakeLists.linux-x86_64.txt
index 5a4de11188..5a4de11188 100644
--- a/ydb/core/blobstorage/vdisk/protos/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/protos/CMakeLists.txt b/ydb/core/blobstorage/vdisk/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/protos/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/query/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/query/CMakeLists.darwin-x86_64.txt
index 6cb0244a1b..6cb0244a1b 100644
--- a/ydb/core/blobstorage/vdisk/query/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/query/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/query/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/query/CMakeLists.linux-x86_64.txt
index 18f93a637d..18f93a637d 100644
--- a/ydb/core/blobstorage/vdisk/query/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/query/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/query/CMakeLists.txt b/ydb/core/blobstorage/vdisk/query/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/query/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/query/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.darwin-x86_64.txt
index c7007dc50e..c7007dc50e 100644
--- a/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.linux-x86_64.txt
index 07368b8b1f..07368b8b1f 100644
--- a/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/repl/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/repl/CMakeLists.darwin-x86_64.txt
index 82a526667c..82a526667c 100644
--- a/ydb/core/blobstorage/vdisk/repl/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/repl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/repl/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/repl/CMakeLists.linux-x86_64.txt
index bdf8c7770e..bdf8c7770e 100644
--- a/ydb/core/blobstorage/vdisk/repl/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/repl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/repl/CMakeLists.txt b/ydb/core/blobstorage/vdisk/repl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/repl/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/repl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.darwin-x86_64.txt
index 98a7d0c7c2..98a7d0c7c2 100644
--- a/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.linux-x86_64.txt
index 72f5a51e21..72f5a51e21 100644
--- a/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/scrub/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/scrub/CMakeLists.darwin-x86_64.txt
index c8c2529e7b..c8c2529e7b 100644
--- a/ydb/core/blobstorage/vdisk/scrub/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/scrub/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/scrub/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/scrub/CMakeLists.linux-x86_64.txt
index af30c56515..af30c56515 100644
--- a/ydb/core/blobstorage/vdisk/scrub/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/scrub/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/scrub/CMakeLists.txt b/ydb/core/blobstorage/vdisk/scrub/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/scrub/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/scrub/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.darwin-x86_64.txt
index e06a362323..e06a362323 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.linux-x86_64.txt
index bc6836ca5f..bc6836ca5f 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.txt b/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/skeleton/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.darwin-x86_64.txt
index c687bf61ca..c687bf61ca 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.linux-x86_64.txt
index 757c153aa1..757c153aa1 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/syncer/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/syncer/CMakeLists.darwin-x86_64.txt
index 61cea37ccd..61cea37ccd 100644
--- a/ydb/core/blobstorage/vdisk/syncer/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/syncer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/syncer/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/syncer/CMakeLists.linux-x86_64.txt
index ae4f1bd991..ae4f1bd991 100644
--- a/ydb/core/blobstorage/vdisk/syncer/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/syncer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/syncer/CMakeLists.txt b/ydb/core/blobstorage/vdisk/syncer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/syncer/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/syncer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.darwin-x86_64.txt
index cff7685b87..cff7685b87 100644
--- a/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.linux-x86_64.txt
index fca392964d..fca392964d 100644
--- a/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/synclog/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/synclog/CMakeLists.darwin-x86_64.txt
index 7f7b24842e..7f7b24842e 100644
--- a/ydb/core/blobstorage/vdisk/synclog/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/synclog/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/synclog/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/synclog/CMakeLists.linux-x86_64.txt
index 915b761bc9..915b761bc9 100644
--- a/ydb/core/blobstorage/vdisk/synclog/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/synclog/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/synclog/CMakeLists.txt b/ydb/core/blobstorage/vdisk/synclog/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/synclog/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/synclog/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.darwin-x86_64.txt
index fa2959acf1..fa2959acf1 100644
--- a/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.linux-x86_64.txt
index e2ed75d6d8..e2ed75d6d8 100644
--- a/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blockstore/CMakeLists.darwin.txt b/ydb/core/blockstore/CMakeLists.darwin-x86_64.txt
index ed93748cb8..ed93748cb8 100644
--- a/ydb/core/blockstore/CMakeLists.darwin.txt
+++ b/ydb/core/blockstore/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blockstore/CMakeLists.linux.txt b/ydb/core/blockstore/CMakeLists.linux-x86_64.txt
index 7202f87c0b..7202f87c0b 100644
--- a/ydb/core/blockstore/CMakeLists.linux.txt
+++ b/ydb/core/blockstore/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blockstore/CMakeLists.txt b/ydb/core/blockstore/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blockstore/CMakeLists.txt
+++ b/ydb/core/blockstore/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/blockstore/core/CMakeLists.darwin.txt b/ydb/core/blockstore/core/CMakeLists.darwin-x86_64.txt
index d0f8a190e4..d0f8a190e4 100644
--- a/ydb/core/blockstore/core/CMakeLists.darwin.txt
+++ b/ydb/core/blockstore/core/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/blockstore/core/CMakeLists.linux.txt b/ydb/core/blockstore/core/CMakeLists.linux-x86_64.txt
index 9fabe549b2..9fabe549b2 100644
--- a/ydb/core/blockstore/core/CMakeLists.linux.txt
+++ b/ydb/core/blockstore/core/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/blockstore/core/CMakeLists.txt b/ydb/core/blockstore/core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/blockstore/core/CMakeLists.txt
+++ b/ydb/core/blockstore/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/CMakeLists.darwin.txt b/ydb/core/client/CMakeLists.darwin-x86_64.txt
index 5efa3c83bc..5efa3c83bc 100644
--- a/ydb/core/client/CMakeLists.darwin.txt
+++ b/ydb/core/client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/CMakeLists.linux.txt b/ydb/core/client/CMakeLists.linux-x86_64.txt
index 7acb7b8aec..7acb7b8aec 100644
--- a/ydb/core/client/CMakeLists.linux.txt
+++ b/ydb/core/client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/CMakeLists.txt b/ydb/core/client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/CMakeLists.txt
+++ b/ydb/core/client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/metadata/CMakeLists.darwin.txt b/ydb/core/client/metadata/CMakeLists.darwin-x86_64.txt
index a719900369..a719900369 100644
--- a/ydb/core/client/metadata/CMakeLists.darwin.txt
+++ b/ydb/core/client/metadata/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/metadata/CMakeLists.linux.txt b/ydb/core/client/metadata/CMakeLists.linux-x86_64.txt
index 1740fc0d6b..1740fc0d6b 100644
--- a/ydb/core/client/metadata/CMakeLists.linux.txt
+++ b/ydb/core/client/metadata/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/metadata/CMakeLists.txt b/ydb/core/client/metadata/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/metadata/CMakeLists.txt
+++ b/ydb/core/client/metadata/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/metadata/ut/CMakeLists.darwin.txt b/ydb/core/client/metadata/ut/CMakeLists.darwin-x86_64.txt
index a4583e5926..a4583e5926 100644
--- a/ydb/core/client/metadata/ut/CMakeLists.darwin.txt
+++ b/ydb/core/client/metadata/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/metadata/ut/CMakeLists.linux.txt b/ydb/core/client/metadata/ut/CMakeLists.linux-x86_64.txt
index 68fdf96dce..68fdf96dce 100644
--- a/ydb/core/client/metadata/ut/CMakeLists.linux.txt
+++ b/ydb/core/client/metadata/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/metadata/ut/CMakeLists.txt b/ydb/core/client/metadata/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/metadata/ut/CMakeLists.txt
+++ b/ydb/core/client/metadata/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/minikql_compile/CMakeLists.darwin.txt b/ydb/core/client/minikql_compile/CMakeLists.darwin-x86_64.txt
index b2ddd12c3b..b2ddd12c3b 100644
--- a/ydb/core/client/minikql_compile/CMakeLists.darwin.txt
+++ b/ydb/core/client/minikql_compile/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/minikql_compile/CMakeLists.linux.txt b/ydb/core/client/minikql_compile/CMakeLists.linux-x86_64.txt
index 2b8d36d1f8..2b8d36d1f8 100644
--- a/ydb/core/client/minikql_compile/CMakeLists.linux.txt
+++ b/ydb/core/client/minikql_compile/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/minikql_compile/CMakeLists.txt b/ydb/core/client/minikql_compile/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/minikql_compile/CMakeLists.txt
+++ b/ydb/core/client/minikql_compile/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/minikql_compile/ut/CMakeLists.darwin.txt b/ydb/core/client/minikql_compile/ut/CMakeLists.darwin-x86_64.txt
index b58773b4d1..b58773b4d1 100644
--- a/ydb/core/client/minikql_compile/ut/CMakeLists.darwin.txt
+++ b/ydb/core/client/minikql_compile/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/minikql_compile/ut/CMakeLists.linux.txt b/ydb/core/client/minikql_compile/ut/CMakeLists.linux-x86_64.txt
index 44089a341f..44089a341f 100644
--- a/ydb/core/client/minikql_compile/ut/CMakeLists.linux.txt
+++ b/ydb/core/client/minikql_compile/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/minikql_compile/ut/CMakeLists.txt b/ydb/core/client/minikql_compile/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/minikql_compile/ut/CMakeLists.txt
+++ b/ydb/core/client/minikql_compile/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/minikql_result_lib/CMakeLists.darwin.txt b/ydb/core/client/minikql_result_lib/CMakeLists.darwin-x86_64.txt
index d66fdd861b..d66fdd861b 100644
--- a/ydb/core/client/minikql_result_lib/CMakeLists.darwin.txt
+++ b/ydb/core/client/minikql_result_lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/minikql_result_lib/CMakeLists.linux.txt b/ydb/core/client/minikql_result_lib/CMakeLists.linux-x86_64.txt
index 58ffd370d2..58ffd370d2 100644
--- a/ydb/core/client/minikql_result_lib/CMakeLists.linux.txt
+++ b/ydb/core/client/minikql_result_lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/minikql_result_lib/CMakeLists.txt b/ydb/core/client/minikql_result_lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/minikql_result_lib/CMakeLists.txt
+++ b/ydb/core/client/minikql_result_lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/minikql_result_lib/ut/CMakeLists.darwin.txt b/ydb/core/client/minikql_result_lib/ut/CMakeLists.darwin-x86_64.txt
index 944283370d..944283370d 100644
--- a/ydb/core/client/minikql_result_lib/ut/CMakeLists.darwin.txt
+++ b/ydb/core/client/minikql_result_lib/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/minikql_result_lib/ut/CMakeLists.linux.txt b/ydb/core/client/minikql_result_lib/ut/CMakeLists.linux-x86_64.txt
index 881ee4ed1b..881ee4ed1b 100644
--- a/ydb/core/client/minikql_result_lib/ut/CMakeLists.linux.txt
+++ b/ydb/core/client/minikql_result_lib/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/minikql_result_lib/ut/CMakeLists.txt b/ydb/core/client/minikql_result_lib/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/minikql_result_lib/ut/CMakeLists.txt
+++ b/ydb/core/client/minikql_result_lib/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/scheme_cache_lib/CMakeLists.darwin.txt b/ydb/core/client/scheme_cache_lib/CMakeLists.darwin-x86_64.txt
index 050ab290ad..050ab290ad 100644
--- a/ydb/core/client/scheme_cache_lib/CMakeLists.darwin.txt
+++ b/ydb/core/client/scheme_cache_lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/scheme_cache_lib/CMakeLists.linux.txt b/ydb/core/client/scheme_cache_lib/CMakeLists.linux-x86_64.txt
index e037e0d38e..e037e0d38e 100644
--- a/ydb/core/client/scheme_cache_lib/CMakeLists.linux.txt
+++ b/ydb/core/client/scheme_cache_lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/scheme_cache_lib/CMakeLists.txt b/ydb/core/client/scheme_cache_lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/scheme_cache_lib/CMakeLists.txt
+++ b/ydb/core/client/scheme_cache_lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/server/CMakeLists.darwin.txt b/ydb/core/client/server/CMakeLists.darwin-x86_64.txt
index 7a21a80454..7a21a80454 100644
--- a/ydb/core/client/server/CMakeLists.darwin.txt
+++ b/ydb/core/client/server/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/server/CMakeLists.linux.txt b/ydb/core/client/server/CMakeLists.linux-x86_64.txt
index 19c6922268..19c6922268 100644
--- a/ydb/core/client/server/CMakeLists.linux.txt
+++ b/ydb/core/client/server/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/server/CMakeLists.txt b/ydb/core/client/server/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/server/CMakeLists.txt
+++ b/ydb/core/client/server/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/server/ut/CMakeLists.darwin.txt b/ydb/core/client/server/ut/CMakeLists.darwin-x86_64.txt
index 8e61fae030..8e61fae030 100644
--- a/ydb/core/client/server/ut/CMakeLists.darwin.txt
+++ b/ydb/core/client/server/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/server/ut/CMakeLists.linux.txt b/ydb/core/client/server/ut/CMakeLists.linux-x86_64.txt
index fca529d93f..fca529d93f 100644
--- a/ydb/core/client/server/ut/CMakeLists.linux.txt
+++ b/ydb/core/client/server/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/server/ut/CMakeLists.txt b/ydb/core/client/server/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/server/ut/CMakeLists.txt
+++ b/ydb/core/client/server/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/client/ut/CMakeLists.darwin.txt b/ydb/core/client/ut/CMakeLists.darwin-x86_64.txt
index a67c735a93..a67c735a93 100644
--- a/ydb/core/client/ut/CMakeLists.darwin.txt
+++ b/ydb/core/client/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/client/ut/CMakeLists.linux.txt b/ydb/core/client/ut/CMakeLists.linux-x86_64.txt
index 5f19f08bf4..5f19f08bf4 100644
--- a/ydb/core/client/ut/CMakeLists.linux.txt
+++ b/ydb/core/client/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/client/ut/CMakeLists.txt b/ydb/core/client/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/client/ut/CMakeLists.txt
+++ b/ydb/core/client/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/CMakeLists.darwin.txt b/ydb/core/cms/CMakeLists.darwin-x86_64.txt
index a02c7ca2b9..a02c7ca2b9 100644
--- a/ydb/core/cms/CMakeLists.darwin.txt
+++ b/ydb/core/cms/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/CMakeLists.linux.txt b/ydb/core/cms/CMakeLists.linux-x86_64.txt
index ea0817c47b..ea0817c47b 100644
--- a/ydb/core/cms/CMakeLists.linux.txt
+++ b/ydb/core/cms/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/CMakeLists.txt b/ydb/core/cms/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/CMakeLists.txt
+++ b/ydb/core/cms/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/console/CMakeLists.darwin.txt b/ydb/core/cms/console/CMakeLists.darwin-x86_64.txt
index f30062488e..f30062488e 100644
--- a/ydb/core/cms/console/CMakeLists.darwin.txt
+++ b/ydb/core/cms/console/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/console/CMakeLists.linux.txt b/ydb/core/cms/console/CMakeLists.linux-x86_64.txt
index d14883cc6f..d14883cc6f 100644
--- a/ydb/core/cms/console/CMakeLists.linux.txt
+++ b/ydb/core/cms/console/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/console/CMakeLists.txt b/ydb/core/cms/console/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/console/CMakeLists.txt
+++ b/ydb/core/cms/console/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/console/ut/CMakeLists.darwin.txt b/ydb/core/cms/console/ut/CMakeLists.darwin-x86_64.txt
index 6bc5981371..6bc5981371 100644
--- a/ydb/core/cms/console/ut/CMakeLists.darwin.txt
+++ b/ydb/core/cms/console/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/console/ut/CMakeLists.linux.txt b/ydb/core/cms/console/ut/CMakeLists.linux-x86_64.txt
index a84153bfb7..a84153bfb7 100644
--- a/ydb/core/cms/console/ut/CMakeLists.linux.txt
+++ b/ydb/core/cms/console/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/console/ut/CMakeLists.txt b/ydb/core/cms/console/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/console/ut/CMakeLists.txt
+++ b/ydb/core/cms/console/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/console/validators/CMakeLists.darwin.txt b/ydb/core/cms/console/validators/CMakeLists.darwin-x86_64.txt
index ae6ae3abc0..ae6ae3abc0 100644
--- a/ydb/core/cms/console/validators/CMakeLists.darwin.txt
+++ b/ydb/core/cms/console/validators/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/console/validators/CMakeLists.linux.txt b/ydb/core/cms/console/validators/CMakeLists.linux-x86_64.txt
index 11d91e59fc..11d91e59fc 100644
--- a/ydb/core/cms/console/validators/CMakeLists.linux.txt
+++ b/ydb/core/cms/console/validators/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/console/validators/CMakeLists.txt b/ydb/core/cms/console/validators/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/console/validators/CMakeLists.txt
+++ b/ydb/core/cms/console/validators/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/console/validators/ut/CMakeLists.darwin.txt b/ydb/core/cms/console/validators/ut/CMakeLists.darwin-x86_64.txt
index 2be4784d6d..2be4784d6d 100644
--- a/ydb/core/cms/console/validators/ut/CMakeLists.darwin.txt
+++ b/ydb/core/cms/console/validators/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/console/validators/ut/CMakeLists.linux.txt b/ydb/core/cms/console/validators/ut/CMakeLists.linux-x86_64.txt
index 58097501de..58097501de 100644
--- a/ydb/core/cms/console/validators/ut/CMakeLists.linux.txt
+++ b/ydb/core/cms/console/validators/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/console/validators/ut/CMakeLists.txt b/ydb/core/cms/console/validators/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/console/validators/ut/CMakeLists.txt
+++ b/ydb/core/cms/console/validators/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/console/yaml_config/CMakeLists.darwin.txt b/ydb/core/cms/console/yaml_config/CMakeLists.darwin-x86_64.txt
index 4d09e79f3a..4d09e79f3a 100644
--- a/ydb/core/cms/console/yaml_config/CMakeLists.darwin.txt
+++ b/ydb/core/cms/console/yaml_config/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/console/yaml_config/CMakeLists.linux.txt b/ydb/core/cms/console/yaml_config/CMakeLists.linux-x86_64.txt
index b78dac11e7..b78dac11e7 100644
--- a/ydb/core/cms/console/yaml_config/CMakeLists.linux.txt
+++ b/ydb/core/cms/console/yaml_config/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/console/yaml_config/CMakeLists.txt b/ydb/core/cms/console/yaml_config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/console/yaml_config/CMakeLists.txt
+++ b/ydb/core/cms/console/yaml_config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/console/yaml_config/ut/CMakeLists.darwin.txt b/ydb/core/cms/console/yaml_config/ut/CMakeLists.darwin-x86_64.txt
index 44a8808b89..44a8808b89 100644
--- a/ydb/core/cms/console/yaml_config/ut/CMakeLists.darwin.txt
+++ b/ydb/core/cms/console/yaml_config/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/console/yaml_config/ut/CMakeLists.linux.txt b/ydb/core/cms/console/yaml_config/ut/CMakeLists.linux-x86_64.txt
index 6e9bb14df4..6e9bb14df4 100644
--- a/ydb/core/cms/console/yaml_config/ut/CMakeLists.linux.txt
+++ b/ydb/core/cms/console/yaml_config/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/console/yaml_config/ut/CMakeLists.txt b/ydb/core/cms/console/yaml_config/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/console/yaml_config/ut/CMakeLists.txt
+++ b/ydb/core/cms/console/yaml_config/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/ut/CMakeLists.darwin.txt b/ydb/core/cms/ut/CMakeLists.darwin-x86_64.txt
index d921d4bdc7..d921d4bdc7 100644
--- a/ydb/core/cms/ut/CMakeLists.darwin.txt
+++ b/ydb/core/cms/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/ut/CMakeLists.linux.txt b/ydb/core/cms/ut/CMakeLists.linux-x86_64.txt
index d9fadfcacb..d9fadfcacb 100644
--- a/ydb/core/cms/ut/CMakeLists.linux.txt
+++ b/ydb/core/cms/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/ut/CMakeLists.txt b/ydb/core/cms/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/ut/CMakeLists.txt
+++ b/ydb/core/cms/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/cms/ut_sentinel/CMakeLists.darwin.txt b/ydb/core/cms/ut_sentinel/CMakeLists.darwin-x86_64.txt
index ebaa431183..ebaa431183 100644
--- a/ydb/core/cms/ut_sentinel/CMakeLists.darwin.txt
+++ b/ydb/core/cms/ut_sentinel/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/cms/ut_sentinel/CMakeLists.linux.txt b/ydb/core/cms/ut_sentinel/CMakeLists.linux-x86_64.txt
index 81ba66cf19..81ba66cf19 100644
--- a/ydb/core/cms/ut_sentinel/CMakeLists.linux.txt
+++ b/ydb/core/cms/ut_sentinel/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/cms/ut_sentinel/CMakeLists.txt b/ydb/core/cms/ut_sentinel/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/cms/ut_sentinel/CMakeLists.txt
+++ b/ydb/core/cms/ut_sentinel/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/control/CMakeLists.darwin.txt b/ydb/core/control/CMakeLists.darwin-x86_64.txt
index fea407f206..fea407f206 100644
--- a/ydb/core/control/CMakeLists.darwin.txt
+++ b/ydb/core/control/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/control/CMakeLists.linux.txt b/ydb/core/control/CMakeLists.linux-x86_64.txt
index bdc9d1dd8e..bdc9d1dd8e 100644
--- a/ydb/core/control/CMakeLists.linux.txt
+++ b/ydb/core/control/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/control/CMakeLists.txt b/ydb/core/control/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/control/CMakeLists.txt
+++ b/ydb/core/control/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/control/ut/CMakeLists.darwin.txt b/ydb/core/control/ut/CMakeLists.darwin-x86_64.txt
index f06b7c0fff..f06b7c0fff 100644
--- a/ydb/core/control/ut/CMakeLists.darwin.txt
+++ b/ydb/core/control/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/control/ut/CMakeLists.linux.txt b/ydb/core/control/ut/CMakeLists.linux-x86_64.txt
index ea8d635a5c..ea8d635a5c 100644
--- a/ydb/core/control/ut/CMakeLists.linux.txt
+++ b/ydb/core/control/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/control/ut/CMakeLists.txt b/ydb/core/control/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/control/ut/CMakeLists.txt
+++ b/ydb/core/control/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/debug/CMakeLists.darwin.txt b/ydb/core/debug/CMakeLists.darwin-x86_64.txt
index ebb5e769c7..ebb5e769c7 100644
--- a/ydb/core/debug/CMakeLists.darwin.txt
+++ b/ydb/core/debug/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/debug/CMakeLists.linux.txt b/ydb/core/debug/CMakeLists.linux-x86_64.txt
index d5b228940e..d5b228940e 100644
--- a/ydb/core/debug/CMakeLists.linux.txt
+++ b/ydb/core/debug/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/debug/CMakeLists.txt b/ydb/core/debug/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/debug/CMakeLists.txt
+++ b/ydb/core/debug/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/discovery/CMakeLists.darwin.txt b/ydb/core/discovery/CMakeLists.darwin-x86_64.txt
index c0cec4da9f..c0cec4da9f 100644
--- a/ydb/core/discovery/CMakeLists.darwin.txt
+++ b/ydb/core/discovery/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/discovery/CMakeLists.linux.txt b/ydb/core/discovery/CMakeLists.linux-x86_64.txt
index 947d35199c..947d35199c 100644
--- a/ydb/core/discovery/CMakeLists.linux.txt
+++ b/ydb/core/discovery/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/discovery/CMakeLists.txt b/ydb/core/discovery/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/discovery/CMakeLists.txt
+++ b/ydb/core/discovery/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/driver_lib/base_utils/CMakeLists.darwin.txt b/ydb/core/driver_lib/base_utils/CMakeLists.darwin-x86_64.txt
index 52e306422b..52e306422b 100644
--- a/ydb/core/driver_lib/base_utils/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/base_utils/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/driver_lib/base_utils/CMakeLists.linux.txt b/ydb/core/driver_lib/base_utils/CMakeLists.linux-x86_64.txt
index 19a6d49278..19a6d49278 100644
--- a/ydb/core/driver_lib/base_utils/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/base_utils/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/driver_lib/base_utils/CMakeLists.txt b/ydb/core/driver_lib/base_utils/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/driver_lib/base_utils/CMakeLists.txt
+++ b/ydb/core/driver_lib/base_utils/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/driver_lib/cli_base/CMakeLists.darwin.txt b/ydb/core/driver_lib/cli_base/CMakeLists.darwin-x86_64.txt
index 277f032734..277f032734 100644
--- a/ydb/core/driver_lib/cli_base/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/cli_base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/driver_lib/cli_base/CMakeLists.linux.txt b/ydb/core/driver_lib/cli_base/CMakeLists.linux-x86_64.txt
index a646a9a5b0..a646a9a5b0 100644
--- a/ydb/core/driver_lib/cli_base/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/cli_base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/driver_lib/cli_base/CMakeLists.txt b/ydb/core/driver_lib/cli_base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/driver_lib/cli_base/CMakeLists.txt
+++ b/ydb/core/driver_lib/cli_base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/driver_lib/cli_config_base/CMakeLists.darwin.txt b/ydb/core/driver_lib/cli_config_base/CMakeLists.darwin-x86_64.txt
index 55f3c886ac..55f3c886ac 100644
--- a/ydb/core/driver_lib/cli_config_base/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/cli_config_base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/driver_lib/cli_config_base/CMakeLists.linux.txt b/ydb/core/driver_lib/cli_config_base/CMakeLists.linux-x86_64.txt
index 60de323963..60de323963 100644
--- a/ydb/core/driver_lib/cli_config_base/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/cli_config_base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/driver_lib/cli_config_base/CMakeLists.txt b/ydb/core/driver_lib/cli_config_base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/driver_lib/cli_config_base/CMakeLists.txt
+++ b/ydb/core/driver_lib/cli_config_base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/driver_lib/cli_utils/CMakeLists.darwin.txt b/ydb/core/driver_lib/cli_utils/CMakeLists.darwin-x86_64.txt
index 3b9d5d19d6..3b9d5d19d6 100644
--- a/ydb/core/driver_lib/cli_utils/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/cli_utils/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/driver_lib/cli_utils/CMakeLists.linux.txt b/ydb/core/driver_lib/cli_utils/CMakeLists.linux-x86_64.txt
index 6e5b760dbd..6e5b760dbd 100644
--- a/ydb/core/driver_lib/cli_utils/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/cli_utils/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/driver_lib/cli_utils/CMakeLists.txt b/ydb/core/driver_lib/cli_utils/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/driver_lib/cli_utils/CMakeLists.txt
+++ b/ydb/core/driver_lib/cli_utils/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/driver_lib/run/CMakeLists.darwin.txt b/ydb/core/driver_lib/run/CMakeLists.darwin-x86_64.txt
index 411c78bad7..411c78bad7 100644
--- a/ydb/core/driver_lib/run/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/driver_lib/run/CMakeLists.linux.txt b/ydb/core/driver_lib/run/CMakeLists.linux-x86_64.txt
index 0f62710fa1..0f62710fa1 100644
--- a/ydb/core/driver_lib/run/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/driver_lib/run/CMakeLists.txt b/ydb/core/driver_lib/run/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/driver_lib/run/CMakeLists.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/driver_lib/version/CMakeLists.darwin.txt b/ydb/core/driver_lib/version/CMakeLists.darwin-x86_64.txt
index e370f32dc2..e370f32dc2 100644
--- a/ydb/core/driver_lib/version/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/version/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/driver_lib/version/CMakeLists.linux.txt b/ydb/core/driver_lib/version/CMakeLists.linux-x86_64.txt
index 3b640c1246..3b640c1246 100644
--- a/ydb/core/driver_lib/version/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/version/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/driver_lib/version/CMakeLists.txt b/ydb/core/driver_lib/version/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/driver_lib/version/CMakeLists.txt
+++ b/ydb/core/driver_lib/version/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.darwin.txt b/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt
index c8d19076be..c8d19076be 100644
--- a/ydb/core/driver_lib/version/ut/CMakeLists.darwin.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.linux.txt b/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt
index 2820945b22..2820945b22 100644
--- a/ydb/core/driver_lib/version/ut/CMakeLists.linux.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.txt b/ydb/core/driver_lib/version/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/driver_lib/version/ut/CMakeLists.txt
+++ b/ydb/core/driver_lib/version/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/engine/CMakeLists.darwin.txt b/ydb/core/engine/CMakeLists.darwin-x86_64.txt
index 0fb8322dd6..0fb8322dd6 100644
--- a/ydb/core/engine/CMakeLists.darwin.txt
+++ b/ydb/core/engine/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/engine/CMakeLists.linux.txt b/ydb/core/engine/CMakeLists.linux-x86_64.txt
index 9c26881873..9c26881873 100644
--- a/ydb/core/engine/CMakeLists.linux.txt
+++ b/ydb/core/engine/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/engine/CMakeLists.txt b/ydb/core/engine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/engine/CMakeLists.txt
+++ b/ydb/core/engine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/engine/minikql/CMakeLists.darwin.txt b/ydb/core/engine/minikql/CMakeLists.darwin-x86_64.txt
index 924d66edc5..924d66edc5 100644
--- a/ydb/core/engine/minikql/CMakeLists.darwin.txt
+++ b/ydb/core/engine/minikql/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/engine/minikql/CMakeLists.linux.txt b/ydb/core/engine/minikql/CMakeLists.linux-x86_64.txt
index 2189242369..2189242369 100644
--- a/ydb/core/engine/minikql/CMakeLists.linux.txt
+++ b/ydb/core/engine/minikql/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/engine/minikql/CMakeLists.txt b/ydb/core/engine/minikql/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/engine/minikql/CMakeLists.txt
+++ b/ydb/core/engine/minikql/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/engine/ut/CMakeLists.darwin.txt b/ydb/core/engine/ut/CMakeLists.darwin-x86_64.txt
index 8f090fc2c6..8f090fc2c6 100644
--- a/ydb/core/engine/ut/CMakeLists.darwin.txt
+++ b/ydb/core/engine/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/engine/ut/CMakeLists.linux.txt b/ydb/core/engine/ut/CMakeLists.linux-x86_64.txt
index 48d73efe8d..48d73efe8d 100644
--- a/ydb/core/engine/ut/CMakeLists.linux.txt
+++ b/ydb/core/engine/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/engine/ut/CMakeLists.txt b/ydb/core/engine/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/engine/ut/CMakeLists.txt
+++ b/ydb/core/engine/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/erasure/CMakeLists.darwin.txt b/ydb/core/erasure/CMakeLists.darwin-x86_64.txt
index 29f504e07a..29f504e07a 100644
--- a/ydb/core/erasure/CMakeLists.darwin.txt
+++ b/ydb/core/erasure/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/erasure/CMakeLists.linux.txt b/ydb/core/erasure/CMakeLists.linux-x86_64.txt
index 4d21fbe9ad..4d21fbe9ad 100644
--- a/ydb/core/erasure/CMakeLists.linux.txt
+++ b/ydb/core/erasure/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/erasure/CMakeLists.txt b/ydb/core/erasure/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/erasure/CMakeLists.txt
+++ b/ydb/core/erasure/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/erasure/ut/CMakeLists.darwin.txt b/ydb/core/erasure/ut/CMakeLists.darwin-x86_64.txt
index fd975d9e4d..fd975d9e4d 100644
--- a/ydb/core/erasure/ut/CMakeLists.darwin.txt
+++ b/ydb/core/erasure/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/erasure/ut/CMakeLists.linux.txt b/ydb/core/erasure/ut/CMakeLists.linux-x86_64.txt
index 0ab627b682..0ab627b682 100644
--- a/ydb/core/erasure/ut/CMakeLists.linux.txt
+++ b/ydb/core/erasure/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/erasure/ut/CMakeLists.txt b/ydb/core/erasure/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/erasure/ut/CMakeLists.txt
+++ b/ydb/core/erasure/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/erasure/ut_perf/CMakeLists.darwin.txt b/ydb/core/erasure/ut_perf/CMakeLists.darwin-x86_64.txt
index 786ca876e9..786ca876e9 100644
--- a/ydb/core/erasure/ut_perf/CMakeLists.darwin.txt
+++ b/ydb/core/erasure/ut_perf/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/erasure/ut_perf/CMakeLists.linux.txt b/ydb/core/erasure/ut_perf/CMakeLists.linux-x86_64.txt
index 9ccffcb3b5..9ccffcb3b5 100644
--- a/ydb/core/erasure/ut_perf/CMakeLists.linux.txt
+++ b/ydb/core/erasure/ut_perf/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/erasure/ut_perf/CMakeLists.txt b/ydb/core/erasure/ut_perf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/erasure/ut_perf/CMakeLists.txt
+++ b/ydb/core/erasure/ut_perf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/erasure/ut_rope/CMakeLists.darwin.txt b/ydb/core/erasure/ut_rope/CMakeLists.darwin-x86_64.txt
index 200bf02e07..200bf02e07 100644
--- a/ydb/core/erasure/ut_rope/CMakeLists.darwin.txt
+++ b/ydb/core/erasure/ut_rope/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/erasure/ut_rope/CMakeLists.linux.txt b/ydb/core/erasure/ut_rope/CMakeLists.linux-x86_64.txt
index fb84f2005b..fb84f2005b 100644
--- a/ydb/core/erasure/ut_rope/CMakeLists.linux.txt
+++ b/ydb/core/erasure/ut_rope/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/erasure/ut_rope/CMakeLists.txt b/ydb/core/erasure/ut_rope/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/erasure/ut_rope/CMakeLists.txt
+++ b/ydb/core/erasure/ut_rope/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/filestore/CMakeLists.darwin.txt b/ydb/core/filestore/CMakeLists.darwin-x86_64.txt
index 1da110d335..1da110d335 100644
--- a/ydb/core/filestore/CMakeLists.darwin.txt
+++ b/ydb/core/filestore/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/filestore/CMakeLists.linux.txt b/ydb/core/filestore/CMakeLists.linux-x86_64.txt
index fdd743d745..fdd743d745 100644
--- a/ydb/core/filestore/CMakeLists.linux.txt
+++ b/ydb/core/filestore/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/filestore/CMakeLists.txt b/ydb/core/filestore/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/filestore/CMakeLists.txt
+++ b/ydb/core/filestore/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/filestore/core/CMakeLists.darwin.txt b/ydb/core/filestore/core/CMakeLists.darwin-x86_64.txt
index ff157c3f06..ff157c3f06 100644
--- a/ydb/core/filestore/core/CMakeLists.darwin.txt
+++ b/ydb/core/filestore/core/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/filestore/core/CMakeLists.linux.txt b/ydb/core/filestore/core/CMakeLists.linux-x86_64.txt
index 36145e1d10..36145e1d10 100644
--- a/ydb/core/filestore/core/CMakeLists.linux.txt
+++ b/ydb/core/filestore/core/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/filestore/core/CMakeLists.txt b/ydb/core/filestore/core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/filestore/core/CMakeLists.txt
+++ b/ydb/core/filestore/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/formats/CMakeLists.darwin.txt b/ydb/core/formats/CMakeLists.darwin-x86_64.txt
index 5a2d28c0c1..5a2d28c0c1 100644
--- a/ydb/core/formats/CMakeLists.darwin.txt
+++ b/ydb/core/formats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/formats/CMakeLists.linux.txt b/ydb/core/formats/CMakeLists.linux-x86_64.txt
index d0c99c829f..d0c99c829f 100644
--- a/ydb/core/formats/CMakeLists.linux.txt
+++ b/ydb/core/formats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/formats/CMakeLists.txt b/ydb/core/formats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/formats/CMakeLists.txt
+++ b/ydb/core/formats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/formats/ut/CMakeLists.darwin.txt b/ydb/core/formats/ut/CMakeLists.darwin-x86_64.txt
index 0b73809289..0b73809289 100644
--- a/ydb/core/formats/ut/CMakeLists.darwin.txt
+++ b/ydb/core/formats/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/formats/ut/CMakeLists.linux.txt b/ydb/core/formats/ut/CMakeLists.linux-x86_64.txt
index 2be744bfcc..2be744bfcc 100644
--- a/ydb/core/formats/ut/CMakeLists.linux.txt
+++ b/ydb/core/formats/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/formats/ut/CMakeLists.txt b/ydb/core/formats/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/formats/ut/CMakeLists.txt
+++ b/ydb/core/formats/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_caching/CMakeLists.darwin.txt b/ydb/core/grpc_caching/CMakeLists.darwin-x86_64.txt
index e90eb9e564..e90eb9e564 100644
--- a/ydb/core/grpc_caching/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_caching/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_caching/CMakeLists.linux.txt b/ydb/core/grpc_caching/CMakeLists.linux-x86_64.txt
index 29c51c328c..29c51c328c 100644
--- a/ydb/core/grpc_caching/CMakeLists.linux.txt
+++ b/ydb/core/grpc_caching/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_caching/CMakeLists.txt b/ydb/core/grpc_caching/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_caching/CMakeLists.txt
+++ b/ydb/core/grpc_caching/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_services/CMakeLists.darwin.txt b/ydb/core/grpc_services/CMakeLists.darwin-x86_64.txt
index 7b1e0c5eed..7b1e0c5eed 100644
--- a/ydb/core/grpc_services/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_services/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_services/CMakeLists.linux.txt b/ydb/core/grpc_services/CMakeLists.linux-x86_64.txt
index 76a073859f..76a073859f 100644
--- a/ydb/core/grpc_services/CMakeLists.linux.txt
+++ b/ydb/core/grpc_services/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_services/CMakeLists.txt b/ydb/core/grpc_services/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_services/CMakeLists.txt
+++ b/ydb/core/grpc_services/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_services/base/CMakeLists.darwin.txt b/ydb/core/grpc_services/base/CMakeLists.darwin-x86_64.txt
index b912d66f3a..b912d66f3a 100644
--- a/ydb/core/grpc_services/base/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_services/base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_services/base/CMakeLists.linux.txt b/ydb/core/grpc_services/base/CMakeLists.linux-x86_64.txt
index 999a49f6a1..999a49f6a1 100644
--- a/ydb/core/grpc_services/base/CMakeLists.linux.txt
+++ b/ydb/core/grpc_services/base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_services/base/CMakeLists.txt b/ydb/core/grpc_services/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_services/base/CMakeLists.txt
+++ b/ydb/core/grpc_services/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_services/cancelation/CMakeLists.darwin.txt b/ydb/core/grpc_services/cancelation/CMakeLists.darwin-x86_64.txt
index 573a98a8e6..573a98a8e6 100644
--- a/ydb/core/grpc_services/cancelation/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_services/cancelation/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_services/cancelation/CMakeLists.linux.txt b/ydb/core/grpc_services/cancelation/CMakeLists.linux-x86_64.txt
index e10bd78418..e10bd78418 100644
--- a/ydb/core/grpc_services/cancelation/CMakeLists.linux.txt
+++ b/ydb/core/grpc_services/cancelation/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_services/cancelation/CMakeLists.txt b/ydb/core/grpc_services/cancelation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_services/cancelation/CMakeLists.txt
+++ b/ydb/core/grpc_services/cancelation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_services/cancelation/protos/CMakeLists.darwin.txt b/ydb/core/grpc_services/cancelation/protos/CMakeLists.darwin-x86_64.txt
index 4cab6afc30..4cab6afc30 100644
--- a/ydb/core/grpc_services/cancelation/protos/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_services/cancelation/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_services/cancelation/protos/CMakeLists.linux.txt b/ydb/core/grpc_services/cancelation/protos/CMakeLists.linux-x86_64.txt
index b1825d6d1a..b1825d6d1a 100644
--- a/ydb/core/grpc_services/cancelation/protos/CMakeLists.linux.txt
+++ b/ydb/core/grpc_services/cancelation/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_services/cancelation/protos/CMakeLists.txt b/ydb/core/grpc_services/cancelation/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_services/cancelation/protos/CMakeLists.txt
+++ b/ydb/core/grpc_services/cancelation/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_services/counters/CMakeLists.darwin.txt b/ydb/core/grpc_services/counters/CMakeLists.darwin-x86_64.txt
index 9738ee1e46..9738ee1e46 100644
--- a/ydb/core/grpc_services/counters/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_services/counters/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_services/counters/CMakeLists.linux.txt b/ydb/core/grpc_services/counters/CMakeLists.linux-x86_64.txt
index 2c1e1761e7..2c1e1761e7 100644
--- a/ydb/core/grpc_services/counters/CMakeLists.linux.txt
+++ b/ydb/core/grpc_services/counters/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_services/counters/CMakeLists.txt b/ydb/core/grpc_services/counters/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_services/counters/CMakeLists.txt
+++ b/ydb/core/grpc_services/counters/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_services/local_rpc/CMakeLists.darwin.txt b/ydb/core/grpc_services/local_rpc/CMakeLists.darwin-x86_64.txt
index f446f66846..f446f66846 100644
--- a/ydb/core/grpc_services/local_rpc/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_services/local_rpc/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_services/local_rpc/CMakeLists.linux.txt b/ydb/core/grpc_services/local_rpc/CMakeLists.linux-x86_64.txt
index e93f011ded..e93f011ded 100644
--- a/ydb/core/grpc_services/local_rpc/CMakeLists.linux.txt
+++ b/ydb/core/grpc_services/local_rpc/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_services/local_rpc/CMakeLists.txt b/ydb/core/grpc_services/local_rpc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_services/local_rpc/CMakeLists.txt
+++ b/ydb/core/grpc_services/local_rpc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_services/ut/CMakeLists.darwin.txt b/ydb/core/grpc_services/ut/CMakeLists.darwin-x86_64.txt
index a0a5f55596..a0a5f55596 100644
--- a/ydb/core/grpc_services/ut/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_services/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_services/ut/CMakeLists.linux.txt b/ydb/core/grpc_services/ut/CMakeLists.linux-x86_64.txt
index 9ad4eb6ea3..9ad4eb6ea3 100644
--- a/ydb/core/grpc_services/ut/CMakeLists.linux.txt
+++ b/ydb/core/grpc_services/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_services/ut/CMakeLists.txt b/ydb/core/grpc_services/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_services/ut/CMakeLists.txt
+++ b/ydb/core/grpc_services/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_streaming/CMakeLists.darwin.txt b/ydb/core/grpc_streaming/CMakeLists.darwin-x86_64.txt
index 97d3760506..97d3760506 100644
--- a/ydb/core/grpc_streaming/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_streaming/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_streaming/CMakeLists.linux.txt b/ydb/core/grpc_streaming/CMakeLists.linux-x86_64.txt
index 3b9558ee2d..3b9558ee2d 100644
--- a/ydb/core/grpc_streaming/CMakeLists.linux.txt
+++ b/ydb/core/grpc_streaming/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_streaming/CMakeLists.txt b/ydb/core/grpc_streaming/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_streaming/CMakeLists.txt
+++ b/ydb/core/grpc_streaming/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_streaming/ut/CMakeLists.darwin.txt b/ydb/core/grpc_streaming/ut/CMakeLists.darwin-x86_64.txt
index 177e6eda10..177e6eda10 100644
--- a/ydb/core/grpc_streaming/ut/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_streaming/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_streaming/ut/CMakeLists.linux.txt b/ydb/core/grpc_streaming/ut/CMakeLists.linux-x86_64.txt
index b94366797e..b94366797e 100644
--- a/ydb/core/grpc_streaming/ut/CMakeLists.linux.txt
+++ b/ydb/core/grpc_streaming/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_streaming/ut/CMakeLists.txt b/ydb/core/grpc_streaming/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_streaming/ut/CMakeLists.txt
+++ b/ydb/core/grpc_streaming/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/grpc_streaming/ut/grpc/CMakeLists.darwin.txt b/ydb/core/grpc_streaming/ut/grpc/CMakeLists.darwin-x86_64.txt
index cf5d7ddabf..cf5d7ddabf 100644
--- a/ydb/core/grpc_streaming/ut/grpc/CMakeLists.darwin.txt
+++ b/ydb/core/grpc_streaming/ut/grpc/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/grpc_streaming/ut/grpc/CMakeLists.linux.txt b/ydb/core/grpc_streaming/ut/grpc/CMakeLists.linux-x86_64.txt
index 414016cadb..414016cadb 100644
--- a/ydb/core/grpc_streaming/ut/grpc/CMakeLists.linux.txt
+++ b/ydb/core/grpc_streaming/ut/grpc/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/grpc_streaming/ut/grpc/CMakeLists.txt b/ydb/core/grpc_streaming/ut/grpc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/grpc_streaming/ut/grpc/CMakeLists.txt
+++ b/ydb/core/grpc_streaming/ut/grpc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/health_check/CMakeLists.darwin.txt b/ydb/core/health_check/CMakeLists.darwin-x86_64.txt
index 57fa13ff70..57fa13ff70 100644
--- a/ydb/core/health_check/CMakeLists.darwin.txt
+++ b/ydb/core/health_check/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/health_check/CMakeLists.linux.txt b/ydb/core/health_check/CMakeLists.linux-x86_64.txt
index 7cd8c50e92..7cd8c50e92 100644
--- a/ydb/core/health_check/CMakeLists.linux.txt
+++ b/ydb/core/health_check/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/health_check/CMakeLists.txt b/ydb/core/health_check/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/health_check/CMakeLists.txt
+++ b/ydb/core/health_check/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/health_check/ut/CMakeLists.darwin.txt b/ydb/core/health_check/ut/CMakeLists.darwin-x86_64.txt
index 6e19830852..6e19830852 100644
--- a/ydb/core/health_check/ut/CMakeLists.darwin.txt
+++ b/ydb/core/health_check/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/health_check/ut/CMakeLists.linux.txt b/ydb/core/health_check/ut/CMakeLists.linux-x86_64.txt
index f975d74e84..f975d74e84 100644
--- a/ydb/core/health_check/ut/CMakeLists.linux.txt
+++ b/ydb/core/health_check/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/health_check/ut/CMakeLists.txt b/ydb/core/health_check/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/health_check/ut/CMakeLists.txt
+++ b/ydb/core/health_check/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/http_proxy/CMakeLists.darwin.txt b/ydb/core/http_proxy/CMakeLists.darwin-x86_64.txt
index 8a70b7e5ed..8a70b7e5ed 100644
--- a/ydb/core/http_proxy/CMakeLists.darwin.txt
+++ b/ydb/core/http_proxy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/http_proxy/CMakeLists.linux.txt b/ydb/core/http_proxy/CMakeLists.linux-x86_64.txt
index d70963e423..d70963e423 100644
--- a/ydb/core/http_proxy/CMakeLists.linux.txt
+++ b/ydb/core/http_proxy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/http_proxy/CMakeLists.txt b/ydb/core/http_proxy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/http_proxy/CMakeLists.txt
+++ b/ydb/core/http_proxy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/http_proxy/ut/CMakeLists.darwin.txt b/ydb/core/http_proxy/ut/CMakeLists.darwin-x86_64.txt
index 5e8e3539aa..5e8e3539aa 100644
--- a/ydb/core/http_proxy/ut/CMakeLists.darwin.txt
+++ b/ydb/core/http_proxy/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/http_proxy/ut/CMakeLists.linux.txt b/ydb/core/http_proxy/ut/CMakeLists.linux-x86_64.txt
index 57ede8f4a2..57ede8f4a2 100644
--- a/ydb/core/http_proxy/ut/CMakeLists.linux.txt
+++ b/ydb/core/http_proxy/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/http_proxy/ut/CMakeLists.txt b/ydb/core/http_proxy/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/http_proxy/ut/CMakeLists.txt
+++ b/ydb/core/http_proxy/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/io_formats/CMakeLists.darwin.txt b/ydb/core/io_formats/CMakeLists.darwin-x86_64.txt
index c443e626fd..c443e626fd 100644
--- a/ydb/core/io_formats/CMakeLists.darwin.txt
+++ b/ydb/core/io_formats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/io_formats/CMakeLists.linux.txt b/ydb/core/io_formats/CMakeLists.linux-x86_64.txt
index 4a2ffea394..4a2ffea394 100644
--- a/ydb/core/io_formats/CMakeLists.linux.txt
+++ b/ydb/core/io_formats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/io_formats/CMakeLists.txt b/ydb/core/io_formats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/io_formats/CMakeLists.txt
+++ b/ydb/core/io_formats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/io_formats/ut/CMakeLists.darwin.txt b/ydb/core/io_formats/ut/CMakeLists.darwin-x86_64.txt
index e97f7456a5..e97f7456a5 100644
--- a/ydb/core/io_formats/ut/CMakeLists.darwin.txt
+++ b/ydb/core/io_formats/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/io_formats/ut/CMakeLists.linux.txt b/ydb/core/io_formats/ut/CMakeLists.linux-x86_64.txt
index 829ec1d188..829ec1d188 100644
--- a/ydb/core/io_formats/ut/CMakeLists.linux.txt
+++ b/ydb/core/io_formats/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/io_formats/ut/CMakeLists.txt b/ydb/core/io_formats/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/io_formats/ut/CMakeLists.txt
+++ b/ydb/core/io_formats/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kesus/proxy/CMakeLists.darwin.txt b/ydb/core/kesus/proxy/CMakeLists.darwin-x86_64.txt
index 623ce42287..623ce42287 100644
--- a/ydb/core/kesus/proxy/CMakeLists.darwin.txt
+++ b/ydb/core/kesus/proxy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kesus/proxy/CMakeLists.linux.txt b/ydb/core/kesus/proxy/CMakeLists.linux-x86_64.txt
index e7dfe3ffe4..e7dfe3ffe4 100644
--- a/ydb/core/kesus/proxy/CMakeLists.linux.txt
+++ b/ydb/core/kesus/proxy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kesus/proxy/CMakeLists.txt b/ydb/core/kesus/proxy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kesus/proxy/CMakeLists.txt
+++ b/ydb/core/kesus/proxy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kesus/proxy/ut/CMakeLists.darwin.txt b/ydb/core/kesus/proxy/ut/CMakeLists.darwin-x86_64.txt
index ce1cc8a65c..ce1cc8a65c 100644
--- a/ydb/core/kesus/proxy/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kesus/proxy/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kesus/proxy/ut/CMakeLists.linux.txt b/ydb/core/kesus/proxy/ut/CMakeLists.linux-x86_64.txt
index 60c0e5574d..60c0e5574d 100644
--- a/ydb/core/kesus/proxy/ut/CMakeLists.linux.txt
+++ b/ydb/core/kesus/proxy/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kesus/proxy/ut/CMakeLists.txt b/ydb/core/kesus/proxy/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kesus/proxy/ut/CMakeLists.txt
+++ b/ydb/core/kesus/proxy/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kesus/tablet/CMakeLists.darwin.txt b/ydb/core/kesus/tablet/CMakeLists.darwin-x86_64.txt
index 5677b3ecf4..5677b3ecf4 100644
--- a/ydb/core/kesus/tablet/CMakeLists.darwin.txt
+++ b/ydb/core/kesus/tablet/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kesus/tablet/CMakeLists.linux.txt b/ydb/core/kesus/tablet/CMakeLists.linux-x86_64.txt
index 3d71075132..3d71075132 100644
--- a/ydb/core/kesus/tablet/CMakeLists.linux.txt
+++ b/ydb/core/kesus/tablet/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kesus/tablet/CMakeLists.txt b/ydb/core/kesus/tablet/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kesus/tablet/CMakeLists.txt
+++ b/ydb/core/kesus/tablet/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.darwin.txt b/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.darwin-x86_64.txt
index 3ae2330909..3ae2330909 100644
--- a/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.darwin.txt
+++ b/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.linux.txt b/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.linux-x86_64.txt
index c56508b3c0..c56508b3c0 100644
--- a/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.linux.txt
+++ b/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.txt b/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.txt
+++ b/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kesus/tablet/ut/CMakeLists.darwin.txt b/ydb/core/kesus/tablet/ut/CMakeLists.darwin-x86_64.txt
index d1aa8154fb..d1aa8154fb 100644
--- a/ydb/core/kesus/tablet/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kesus/tablet/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kesus/tablet/ut/CMakeLists.linux.txt b/ydb/core/kesus/tablet/ut/CMakeLists.linux-x86_64.txt
index 6de319761d..6de319761d 100644
--- a/ydb/core/kesus/tablet/ut/CMakeLists.linux.txt
+++ b/ydb/core/kesus/tablet/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kesus/tablet/ut/CMakeLists.txt b/ydb/core/kesus/tablet/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kesus/tablet/ut/CMakeLists.txt
+++ b/ydb/core/kesus/tablet/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/keyvalue/CMakeLists.darwin.txt b/ydb/core/keyvalue/CMakeLists.darwin-x86_64.txt
index fa3b2d5eef..fa3b2d5eef 100644
--- a/ydb/core/keyvalue/CMakeLists.darwin.txt
+++ b/ydb/core/keyvalue/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/keyvalue/CMakeLists.linux.txt b/ydb/core/keyvalue/CMakeLists.linux-x86_64.txt
index a0be4d8631..a0be4d8631 100644
--- a/ydb/core/keyvalue/CMakeLists.linux.txt
+++ b/ydb/core/keyvalue/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/keyvalue/CMakeLists.txt b/ydb/core/keyvalue/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/keyvalue/CMakeLists.txt
+++ b/ydb/core/keyvalue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/keyvalue/protos/CMakeLists.darwin.txt b/ydb/core/keyvalue/protos/CMakeLists.darwin-x86_64.txt
index e533541cd4..e533541cd4 100644
--- a/ydb/core/keyvalue/protos/CMakeLists.darwin.txt
+++ b/ydb/core/keyvalue/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/keyvalue/protos/CMakeLists.linux.txt b/ydb/core/keyvalue/protos/CMakeLists.linux-x86_64.txt
index f82d9f019b..f82d9f019b 100644
--- a/ydb/core/keyvalue/protos/CMakeLists.linux.txt
+++ b/ydb/core/keyvalue/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/keyvalue/protos/CMakeLists.txt b/ydb/core/keyvalue/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/keyvalue/protos/CMakeLists.txt
+++ b/ydb/core/keyvalue/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/keyvalue/ut/CMakeLists.darwin.txt b/ydb/core/keyvalue/ut/CMakeLists.darwin-x86_64.txt
index ddf83e16b3..ddf83e16b3 100644
--- a/ydb/core/keyvalue/ut/CMakeLists.darwin.txt
+++ b/ydb/core/keyvalue/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/keyvalue/ut/CMakeLists.linux.txt b/ydb/core/keyvalue/ut/CMakeLists.linux-x86_64.txt
index 056cdb575a..056cdb575a 100644
--- a/ydb/core/keyvalue/ut/CMakeLists.linux.txt
+++ b/ydb/core/keyvalue/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/keyvalue/ut/CMakeLists.txt b/ydb/core/keyvalue/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/keyvalue/ut/CMakeLists.txt
+++ b/ydb/core/keyvalue/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/CMakeLists.darwin.txt b/ydb/core/kqp/CMakeLists.darwin-x86_64.txt
index e82ec0d41a..e82ec0d41a 100644
--- a/ydb/core/kqp/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/CMakeLists.linux.txt b/ydb/core/kqp/CMakeLists.linux-x86_64.txt
index 9e4b855487..9e4b855487 100644
--- a/ydb/core/kqp/CMakeLists.linux.txt
+++ b/ydb/core/kqp/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/CMakeLists.txt b/ydb/core/kqp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/CMakeLists.txt
+++ b/ydb/core/kqp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/common/CMakeLists.darwin.txt b/ydb/core/kqp/common/CMakeLists.darwin-x86_64.txt
index 407bd91dcb..407bd91dcb 100644
--- a/ydb/core/kqp/common/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/common/CMakeLists.linux.txt b/ydb/core/kqp/common/CMakeLists.linux-x86_64.txt
index 940c40b168..940c40b168 100644
--- a/ydb/core/kqp/common/CMakeLists.linux.txt
+++ b/ydb/core/kqp/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/common/CMakeLists.txt b/ydb/core/kqp/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/common/CMakeLists.txt
+++ b/ydb/core/kqp/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/compile_service/CMakeLists.darwin.txt b/ydb/core/kqp/compile_service/CMakeLists.darwin-x86_64.txt
index c8431e865b..c8431e865b 100644
--- a/ydb/core/kqp/compile_service/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/compile_service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/compile_service/CMakeLists.linux.txt b/ydb/core/kqp/compile_service/CMakeLists.linux-x86_64.txt
index 985a5c70ff..985a5c70ff 100644
--- a/ydb/core/kqp/compile_service/CMakeLists.linux.txt
+++ b/ydb/core/kqp/compile_service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/compile_service/CMakeLists.txt b/ydb/core/kqp/compile_service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/compile_service/CMakeLists.txt
+++ b/ydb/core/kqp/compile_service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/compute_actor/CMakeLists.darwin.txt b/ydb/core/kqp/compute_actor/CMakeLists.darwin-x86_64.txt
index 7ec4d4514b..7ec4d4514b 100644
--- a/ydb/core/kqp/compute_actor/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/compute_actor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/compute_actor/CMakeLists.linux.txt b/ydb/core/kqp/compute_actor/CMakeLists.linux-x86_64.txt
index ba8cdee953..ba8cdee953 100644
--- a/ydb/core/kqp/compute_actor/CMakeLists.linux.txt
+++ b/ydb/core/kqp/compute_actor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/compute_actor/CMakeLists.txt b/ydb/core/kqp/compute_actor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/compute_actor/CMakeLists.txt
+++ b/ydb/core/kqp/compute_actor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/counters/CMakeLists.darwin.txt b/ydb/core/kqp/counters/CMakeLists.darwin-x86_64.txt
index 8f457ba4da..8f457ba4da 100644
--- a/ydb/core/kqp/counters/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/counters/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/counters/CMakeLists.linux.txt b/ydb/core/kqp/counters/CMakeLists.linux-x86_64.txt
index f0dbbe779d..f0dbbe779d 100644
--- a/ydb/core/kqp/counters/CMakeLists.linux.txt
+++ b/ydb/core/kqp/counters/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/counters/CMakeLists.txt b/ydb/core/kqp/counters/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/counters/CMakeLists.txt
+++ b/ydb/core/kqp/counters/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/executer_actor/CMakeLists.darwin.txt b/ydb/core/kqp/executer_actor/CMakeLists.darwin-x86_64.txt
index 4de87f9588..4de87f9588 100644
--- a/ydb/core/kqp/executer_actor/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/executer_actor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/executer_actor/CMakeLists.linux.txt b/ydb/core/kqp/executer_actor/CMakeLists.linux-x86_64.txt
index bcfd6eb80f..bcfd6eb80f 100644
--- a/ydb/core/kqp/executer_actor/CMakeLists.linux.txt
+++ b/ydb/core/kqp/executer_actor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/executer_actor/CMakeLists.txt b/ydb/core/kqp/executer_actor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/executer_actor/CMakeLists.txt
+++ b/ydb/core/kqp/executer_actor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/executer_actor/ut/CMakeLists.darwin.txt b/ydb/core/kqp/executer_actor/ut/CMakeLists.darwin-x86_64.txt
index 3588110f9a..3588110f9a 100644
--- a/ydb/core/kqp/executer_actor/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/executer_actor/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/executer_actor/ut/CMakeLists.linux.txt b/ydb/core/kqp/executer_actor/ut/CMakeLists.linux-x86_64.txt
index 0378bd6e5e..0378bd6e5e 100644
--- a/ydb/core/kqp/executer_actor/ut/CMakeLists.linux.txt
+++ b/ydb/core/kqp/executer_actor/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/executer_actor/ut/CMakeLists.txt b/ydb/core/kqp/executer_actor/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/executer_actor/ut/CMakeLists.txt
+++ b/ydb/core/kqp/executer_actor/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/expr_nodes/CMakeLists.darwin.txt b/ydb/core/kqp/expr_nodes/CMakeLists.darwin-x86_64.txt
index f7bb91913a..f7bb91913a 100644
--- a/ydb/core/kqp/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/expr_nodes/CMakeLists.linux.txt b/ydb/core/kqp/expr_nodes/CMakeLists.linux-x86_64.txt
index d4e1a53b13..d4e1a53b13 100644
--- a/ydb/core/kqp/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/core/kqp/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/expr_nodes/CMakeLists.txt b/ydb/core/kqp/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/expr_nodes/CMakeLists.txt
+++ b/ydb/core/kqp/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/gateway/CMakeLists.darwin.txt b/ydb/core/kqp/gateway/CMakeLists.darwin-x86_64.txt
index 1f61f525b3..1f61f525b3 100644
--- a/ydb/core/kqp/gateway/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/gateway/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/gateway/CMakeLists.linux.txt b/ydb/core/kqp/gateway/CMakeLists.linux-x86_64.txt
index d863010351..d863010351 100644
--- a/ydb/core/kqp/gateway/CMakeLists.linux.txt
+++ b/ydb/core/kqp/gateway/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/gateway/CMakeLists.txt b/ydb/core/kqp/gateway/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/gateway/CMakeLists.txt
+++ b/ydb/core/kqp/gateway/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/host/CMakeLists.darwin.txt b/ydb/core/kqp/host/CMakeLists.darwin-x86_64.txt
index 3e80449fbe..3e80449fbe 100644
--- a/ydb/core/kqp/host/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/host/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/host/CMakeLists.linux.txt b/ydb/core/kqp/host/CMakeLists.linux-x86_64.txt
index 267052dcc1..267052dcc1 100644
--- a/ydb/core/kqp/host/CMakeLists.linux.txt
+++ b/ydb/core/kqp/host/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/host/CMakeLists.txt b/ydb/core/kqp/host/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/host/CMakeLists.txt
+++ b/ydb/core/kqp/host/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/node_service/CMakeLists.darwin.txt b/ydb/core/kqp/node_service/CMakeLists.darwin-x86_64.txt
index 3656f42ea2..3656f42ea2 100644
--- a/ydb/core/kqp/node_service/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/node_service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/node_service/CMakeLists.linux.txt b/ydb/core/kqp/node_service/CMakeLists.linux-x86_64.txt
index 809b67173c..809b67173c 100644
--- a/ydb/core/kqp/node_service/CMakeLists.linux.txt
+++ b/ydb/core/kqp/node_service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/node_service/CMakeLists.txt b/ydb/core/kqp/node_service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/node_service/CMakeLists.txt
+++ b/ydb/core/kqp/node_service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/node_service/ut/CMakeLists.darwin.txt b/ydb/core/kqp/node_service/ut/CMakeLists.darwin-x86_64.txt
index c8eb20052c..c8eb20052c 100644
--- a/ydb/core/kqp/node_service/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/node_service/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/node_service/ut/CMakeLists.linux.txt b/ydb/core/kqp/node_service/ut/CMakeLists.linux-x86_64.txt
index 9554d74f3e..9554d74f3e 100644
--- a/ydb/core/kqp/node_service/ut/CMakeLists.linux.txt
+++ b/ydb/core/kqp/node_service/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/node_service/ut/CMakeLists.txt b/ydb/core/kqp/node_service/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/node_service/ut/CMakeLists.txt
+++ b/ydb/core/kqp/node_service/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/opt/CMakeLists.darwin.txt b/ydb/core/kqp/opt/CMakeLists.darwin-x86_64.txt
index e21e3a2928..e21e3a2928 100644
--- a/ydb/core/kqp/opt/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/opt/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/opt/CMakeLists.linux.txt b/ydb/core/kqp/opt/CMakeLists.linux-x86_64.txt
index 2f01eb2c6d..2f01eb2c6d 100644
--- a/ydb/core/kqp/opt/CMakeLists.linux.txt
+++ b/ydb/core/kqp/opt/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/opt/CMakeLists.txt b/ydb/core/kqp/opt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/opt/CMakeLists.txt
+++ b/ydb/core/kqp/opt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/opt/logical/CMakeLists.darwin.txt b/ydb/core/kqp/opt/logical/CMakeLists.darwin-x86_64.txt
index 987f3e52d2..987f3e52d2 100644
--- a/ydb/core/kqp/opt/logical/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/opt/logical/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/opt/logical/CMakeLists.linux.txt b/ydb/core/kqp/opt/logical/CMakeLists.linux-x86_64.txt
index 37ceb4a01e..37ceb4a01e 100644
--- a/ydb/core/kqp/opt/logical/CMakeLists.linux.txt
+++ b/ydb/core/kqp/opt/logical/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/opt/logical/CMakeLists.txt b/ydb/core/kqp/opt/logical/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/opt/logical/CMakeLists.txt
+++ b/ydb/core/kqp/opt/logical/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/opt/peephole/CMakeLists.darwin.txt b/ydb/core/kqp/opt/peephole/CMakeLists.darwin-x86_64.txt
index 823ec24b9f..823ec24b9f 100644
--- a/ydb/core/kqp/opt/peephole/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/opt/peephole/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/opt/peephole/CMakeLists.linux.txt b/ydb/core/kqp/opt/peephole/CMakeLists.linux-x86_64.txt
index 9f5d4324fd..9f5d4324fd 100644
--- a/ydb/core/kqp/opt/peephole/CMakeLists.linux.txt
+++ b/ydb/core/kqp/opt/peephole/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/opt/peephole/CMakeLists.txt b/ydb/core/kqp/opt/peephole/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/opt/peephole/CMakeLists.txt
+++ b/ydb/core/kqp/opt/peephole/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/opt/physical/CMakeLists.darwin.txt b/ydb/core/kqp/opt/physical/CMakeLists.darwin-x86_64.txt
index 1a25f18234..1a25f18234 100644
--- a/ydb/core/kqp/opt/physical/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/opt/physical/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/opt/physical/CMakeLists.linux.txt b/ydb/core/kqp/opt/physical/CMakeLists.linux-x86_64.txt
index 2662cfd7a6..2662cfd7a6 100644
--- a/ydb/core/kqp/opt/physical/CMakeLists.linux.txt
+++ b/ydb/core/kqp/opt/physical/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/opt/physical/CMakeLists.txt b/ydb/core/kqp/opt/physical/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/opt/physical/CMakeLists.txt
+++ b/ydb/core/kqp/opt/physical/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/opt/physical/effects/CMakeLists.darwin.txt b/ydb/core/kqp/opt/physical/effects/CMakeLists.darwin-x86_64.txt
index d226627416..d226627416 100644
--- a/ydb/core/kqp/opt/physical/effects/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/opt/physical/effects/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/opt/physical/effects/CMakeLists.linux.txt b/ydb/core/kqp/opt/physical/effects/CMakeLists.linux-x86_64.txt
index 761997487e..761997487e 100644
--- a/ydb/core/kqp/opt/physical/effects/CMakeLists.linux.txt
+++ b/ydb/core/kqp/opt/physical/effects/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/opt/physical/effects/CMakeLists.txt b/ydb/core/kqp/opt/physical/effects/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/opt/physical/effects/CMakeLists.txt
+++ b/ydb/core/kqp/opt/physical/effects/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/provider/CMakeLists.darwin.txt b/ydb/core/kqp/provider/CMakeLists.darwin-x86_64.txt
index 5035823f90..5035823f90 100644
--- a/ydb/core/kqp/provider/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/provider/CMakeLists.linux.txt b/ydb/core/kqp/provider/CMakeLists.linux-x86_64.txt
index 6efae41378..6efae41378 100644
--- a/ydb/core/kqp/provider/CMakeLists.linux.txt
+++ b/ydb/core/kqp/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/provider/CMakeLists.txt b/ydb/core/kqp/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/provider/CMakeLists.txt
+++ b/ydb/core/kqp/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/provider/ut/CMakeLists.darwin.txt b/ydb/core/kqp/provider/ut/CMakeLists.darwin-x86_64.txt
index e5a4cf36f5..e5a4cf36f5 100644
--- a/ydb/core/kqp/provider/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/provider/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/provider/ut/CMakeLists.linux.txt b/ydb/core/kqp/provider/ut/CMakeLists.linux-x86_64.txt
index 1205ad3578..1205ad3578 100644
--- a/ydb/core/kqp/provider/ut/CMakeLists.linux.txt
+++ b/ydb/core/kqp/provider/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/provider/ut/CMakeLists.txt b/ydb/core/kqp/provider/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/provider/ut/CMakeLists.txt
+++ b/ydb/core/kqp/provider/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/proxy_service/CMakeLists.darwin.txt b/ydb/core/kqp/proxy_service/CMakeLists.darwin-x86_64.txt
index 1397808681..1397808681 100644
--- a/ydb/core/kqp/proxy_service/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/proxy_service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/proxy_service/CMakeLists.linux.txt b/ydb/core/kqp/proxy_service/CMakeLists.linux-x86_64.txt
index 2e3926b260..2e3926b260 100644
--- a/ydb/core/kqp/proxy_service/CMakeLists.linux.txt
+++ b/ydb/core/kqp/proxy_service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/proxy_service/CMakeLists.txt b/ydb/core/kqp/proxy_service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/proxy_service/CMakeLists.txt
+++ b/ydb/core/kqp/proxy_service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/proxy_service/ut/CMakeLists.darwin.txt b/ydb/core/kqp/proxy_service/ut/CMakeLists.darwin-x86_64.txt
index 3233a6aacb..3233a6aacb 100644
--- a/ydb/core/kqp/proxy_service/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/proxy_service/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/proxy_service/ut/CMakeLists.linux.txt b/ydb/core/kqp/proxy_service/ut/CMakeLists.linux-x86_64.txt
index c461b1be41..c461b1be41 100644
--- a/ydb/core/kqp/proxy_service/ut/CMakeLists.linux.txt
+++ b/ydb/core/kqp/proxy_service/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/proxy_service/ut/CMakeLists.txt b/ydb/core/kqp/proxy_service/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/proxy_service/ut/CMakeLists.txt
+++ b/ydb/core/kqp/proxy_service/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/query_compiler/CMakeLists.darwin.txt b/ydb/core/kqp/query_compiler/CMakeLists.darwin-x86_64.txt
index c848e589bd..c848e589bd 100644
--- a/ydb/core/kqp/query_compiler/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/query_compiler/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/query_compiler/CMakeLists.linux.txt b/ydb/core/kqp/query_compiler/CMakeLists.linux-x86_64.txt
index bd6045c8f0..bd6045c8f0 100644
--- a/ydb/core/kqp/query_compiler/CMakeLists.linux.txt
+++ b/ydb/core/kqp/query_compiler/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/query_compiler/CMakeLists.txt b/ydb/core/kqp/query_compiler/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/query_compiler/CMakeLists.txt
+++ b/ydb/core/kqp/query_compiler/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/query_data/CMakeLists.darwin.txt b/ydb/core/kqp/query_data/CMakeLists.darwin-x86_64.txt
index bf9b5d0202..bf9b5d0202 100644
--- a/ydb/core/kqp/query_data/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/query_data/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/query_data/CMakeLists.linux.txt b/ydb/core/kqp/query_data/CMakeLists.linux-x86_64.txt
index a37be07214..a37be07214 100644
--- a/ydb/core/kqp/query_data/CMakeLists.linux.txt
+++ b/ydb/core/kqp/query_data/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/query_data/CMakeLists.txt b/ydb/core/kqp/query_data/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/query_data/CMakeLists.txt
+++ b/ydb/core/kqp/query_data/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/rm_service/CMakeLists.darwin.txt b/ydb/core/kqp/rm_service/CMakeLists.darwin-x86_64.txt
index d7f93026d2..d7f93026d2 100644
--- a/ydb/core/kqp/rm_service/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/rm_service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/rm_service/CMakeLists.linux.txt b/ydb/core/kqp/rm_service/CMakeLists.linux-x86_64.txt
index 78bf95bf0f..78bf95bf0f 100644
--- a/ydb/core/kqp/rm_service/CMakeLists.linux.txt
+++ b/ydb/core/kqp/rm_service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/rm_service/CMakeLists.txt b/ydb/core/kqp/rm_service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/rm_service/CMakeLists.txt
+++ b/ydb/core/kqp/rm_service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/rm_service/ut/CMakeLists.darwin.txt b/ydb/core/kqp/rm_service/ut/CMakeLists.darwin-x86_64.txt
index bf428586d9..bf428586d9 100644
--- a/ydb/core/kqp/rm_service/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/rm_service/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/rm_service/ut/CMakeLists.linux.txt b/ydb/core/kqp/rm_service/ut/CMakeLists.linux-x86_64.txt
index e445763058..e445763058 100644
--- a/ydb/core/kqp/rm_service/ut/CMakeLists.linux.txt
+++ b/ydb/core/kqp/rm_service/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/rm_service/ut/CMakeLists.txt b/ydb/core/kqp/rm_service/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/rm_service/ut/CMakeLists.txt
+++ b/ydb/core/kqp/rm_service/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/run_script_actor/CMakeLists.darwin.txt b/ydb/core/kqp/run_script_actor/CMakeLists.darwin-x86_64.txt
index 0359b1c93e..0359b1c93e 100644
--- a/ydb/core/kqp/run_script_actor/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/run_script_actor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/run_script_actor/CMakeLists.linux.txt b/ydb/core/kqp/run_script_actor/CMakeLists.linux-x86_64.txt
index fb65e2fbd0..fb65e2fbd0 100644
--- a/ydb/core/kqp/run_script_actor/CMakeLists.linux.txt
+++ b/ydb/core/kqp/run_script_actor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/run_script_actor/CMakeLists.txt b/ydb/core/kqp/run_script_actor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/run_script_actor/CMakeLists.txt
+++ b/ydb/core/kqp/run_script_actor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/runtime/CMakeLists.darwin.txt b/ydb/core/kqp/runtime/CMakeLists.darwin-x86_64.txt
index f736770af6..f736770af6 100644
--- a/ydb/core/kqp/runtime/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/runtime/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/runtime/CMakeLists.linux.txt b/ydb/core/kqp/runtime/CMakeLists.linux-x86_64.txt
index 9985ab2196..9985ab2196 100644
--- a/ydb/core/kqp/runtime/CMakeLists.linux.txt
+++ b/ydb/core/kqp/runtime/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/runtime/CMakeLists.txt b/ydb/core/kqp/runtime/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/runtime/CMakeLists.txt
+++ b/ydb/core/kqp/runtime/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/runtime/ut/CMakeLists.darwin.txt b/ydb/core/kqp/runtime/ut/CMakeLists.darwin-x86_64.txt
index 6ca36c5742..6ca36c5742 100644
--- a/ydb/core/kqp/runtime/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/runtime/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/runtime/ut/CMakeLists.linux.txt b/ydb/core/kqp/runtime/ut/CMakeLists.linux-x86_64.txt
index c408e13ccb..c408e13ccb 100644
--- a/ydb/core/kqp/runtime/ut/CMakeLists.linux.txt
+++ b/ydb/core/kqp/runtime/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/runtime/ut/CMakeLists.txt b/ydb/core/kqp/runtime/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/runtime/ut/CMakeLists.txt
+++ b/ydb/core/kqp/runtime/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/session_actor/CMakeLists.darwin.txt b/ydb/core/kqp/session_actor/CMakeLists.darwin-x86_64.txt
index d241a939b3..d241a939b3 100644
--- a/ydb/core/kqp/session_actor/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/session_actor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/session_actor/CMakeLists.linux.txt b/ydb/core/kqp/session_actor/CMakeLists.linux-x86_64.txt
index d54d507f65..d54d507f65 100644
--- a/ydb/core/kqp/session_actor/CMakeLists.linux.txt
+++ b/ydb/core/kqp/session_actor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/session_actor/CMakeLists.txt b/ydb/core/kqp/session_actor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/session_actor/CMakeLists.txt
+++ b/ydb/core/kqp/session_actor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/topics/CMakeLists.darwin.txt b/ydb/core/kqp/topics/CMakeLists.darwin-x86_64.txt
index 3bd77195ea..3bd77195ea 100644
--- a/ydb/core/kqp/topics/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/topics/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/topics/CMakeLists.linux.txt b/ydb/core/kqp/topics/CMakeLists.linux-x86_64.txt
index f3a8e98bf8..f3a8e98bf8 100644
--- a/ydb/core/kqp/topics/CMakeLists.linux.txt
+++ b/ydb/core/kqp/topics/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/topics/CMakeLists.txt b/ydb/core/kqp/topics/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/topics/CMakeLists.txt
+++ b/ydb/core/kqp/topics/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/arrow/CMakeLists.darwin.txt b/ydb/core/kqp/ut/arrow/CMakeLists.darwin-x86_64.txt
index 59549a548d..59549a548d 100644
--- a/ydb/core/kqp/ut/arrow/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/arrow/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/arrow/CMakeLists.linux.txt b/ydb/core/kqp/ut/arrow/CMakeLists.linux-x86_64.txt
index d3bc985e62..d3bc985e62 100644
--- a/ydb/core/kqp/ut/arrow/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/arrow/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/arrow/CMakeLists.txt b/ydb/core/kqp/ut/arrow/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/arrow/CMakeLists.txt
+++ b/ydb/core/kqp/ut/arrow/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/common/CMakeLists.darwin.txt b/ydb/core/kqp/ut/common/CMakeLists.darwin-x86_64.txt
index fd14efe2ef..fd14efe2ef 100644
--- a/ydb/core/kqp/ut/common/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/common/CMakeLists.linux.txt b/ydb/core/kqp/ut/common/CMakeLists.linux-x86_64.txt
index 6f4af35c96..6f4af35c96 100644
--- a/ydb/core/kqp/ut/common/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/common/CMakeLists.txt b/ydb/core/kqp/ut/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/common/CMakeLists.txt
+++ b/ydb/core/kqp/ut/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/cost/CMakeLists.darwin.txt b/ydb/core/kqp/ut/cost/CMakeLists.darwin-x86_64.txt
index 917622b8f0..917622b8f0 100644
--- a/ydb/core/kqp/ut/cost/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/cost/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/cost/CMakeLists.linux.txt b/ydb/core/kqp/ut/cost/CMakeLists.linux-x86_64.txt
index 2a0157a62c..2a0157a62c 100644
--- a/ydb/core/kqp/ut/cost/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/cost/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/cost/CMakeLists.txt b/ydb/core/kqp/ut/cost/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/cost/CMakeLists.txt
+++ b/ydb/core/kqp/ut/cost/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/effects/CMakeLists.darwin.txt b/ydb/core/kqp/ut/effects/CMakeLists.darwin-x86_64.txt
index 6b27df3621..6b27df3621 100644
--- a/ydb/core/kqp/ut/effects/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/effects/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/effects/CMakeLists.linux.txt b/ydb/core/kqp/ut/effects/CMakeLists.linux-x86_64.txt
index 5800982a4e..5800982a4e 100644
--- a/ydb/core/kqp/ut/effects/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/effects/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/effects/CMakeLists.txt b/ydb/core/kqp/ut/effects/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/effects/CMakeLists.txt
+++ b/ydb/core/kqp/ut/effects/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/federated_query/CMakeLists.darwin.txt b/ydb/core/kqp/ut/federated_query/CMakeLists.darwin-x86_64.txt
index 9ce62c1052..9ce62c1052 100644
--- a/ydb/core/kqp/ut/federated_query/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/federated_query/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/federated_query/CMakeLists.linux.txt b/ydb/core/kqp/ut/federated_query/CMakeLists.linux-x86_64.txt
index 625a126be2..625a126be2 100644
--- a/ydb/core/kqp/ut/federated_query/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/federated_query/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/federated_query/CMakeLists.txt b/ydb/core/kqp/ut/federated_query/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/federated_query/CMakeLists.txt
+++ b/ydb/core/kqp/ut/federated_query/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/indexes/CMakeLists.darwin.txt b/ydb/core/kqp/ut/indexes/CMakeLists.darwin-x86_64.txt
index 558cd7da63..558cd7da63 100644
--- a/ydb/core/kqp/ut/indexes/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/indexes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/indexes/CMakeLists.linux.txt b/ydb/core/kqp/ut/indexes/CMakeLists.linux-x86_64.txt
index c51c784087..c51c784087 100644
--- a/ydb/core/kqp/ut/indexes/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/indexes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/indexes/CMakeLists.txt b/ydb/core/kqp/ut/indexes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/indexes/CMakeLists.txt
+++ b/ydb/core/kqp/ut/indexes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/join/CMakeLists.darwin.txt b/ydb/core/kqp/ut/join/CMakeLists.darwin-x86_64.txt
index 718f92f054..718f92f054 100644
--- a/ydb/core/kqp/ut/join/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/join/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/join/CMakeLists.linux.txt b/ydb/core/kqp/ut/join/CMakeLists.linux-x86_64.txt
index d05da89667..d05da89667 100644
--- a/ydb/core/kqp/ut/join/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/join/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/join/CMakeLists.txt b/ydb/core/kqp/ut/join/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/join/CMakeLists.txt
+++ b/ydb/core/kqp/ut/join/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.darwin.txt b/ydb/core/kqp/ut/olap/CMakeLists.darwin-x86_64.txt
index 8b4216f4a8..8b4216f4a8 100644
--- a/ydb/core/kqp/ut/olap/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/olap/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.linux.txt b/ydb/core/kqp/ut/olap/CMakeLists.linux-x86_64.txt
index 10a2f7d904..10a2f7d904 100644
--- a/ydb/core/kqp/ut/olap/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/olap/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/olap/CMakeLists.txt b/ydb/core/kqp/ut/olap/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/olap/CMakeLists.txt
+++ b/ydb/core/kqp/ut/olap/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.darwin.txt b/ydb/core/kqp/ut/opt/CMakeLists.darwin-x86_64.txt
index 25afe41bc3..25afe41bc3 100644
--- a/ydb/core/kqp/ut/opt/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/opt/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.linux.txt b/ydb/core/kqp/ut/opt/CMakeLists.linux-x86_64.txt
index bed67cb198..bed67cb198 100644
--- a/ydb/core/kqp/ut/opt/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/opt/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/opt/CMakeLists.txt b/ydb/core/kqp/ut/opt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/opt/CMakeLists.txt
+++ b/ydb/core/kqp/ut/opt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/perf/CMakeLists.darwin.txt b/ydb/core/kqp/ut/perf/CMakeLists.darwin-x86_64.txt
index 4a2a055ba3..4a2a055ba3 100644
--- a/ydb/core/kqp/ut/perf/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/perf/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/perf/CMakeLists.linux.txt b/ydb/core/kqp/ut/perf/CMakeLists.linux-x86_64.txt
index f62554c806..f62554c806 100644
--- a/ydb/core/kqp/ut/perf/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/perf/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/perf/CMakeLists.txt b/ydb/core/kqp/ut/perf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/perf/CMakeLists.txt
+++ b/ydb/core/kqp/ut/perf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/pg/CMakeLists.darwin.txt b/ydb/core/kqp/ut/pg/CMakeLists.darwin-x86_64.txt
index cc67be7103..cc67be7103 100644
--- a/ydb/core/kqp/ut/pg/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/pg/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/pg/CMakeLists.linux.txt b/ydb/core/kqp/ut/pg/CMakeLists.linux-x86_64.txt
index bbac30fe01..bbac30fe01 100644
--- a/ydb/core/kqp/ut/pg/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/pg/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/pg/CMakeLists.txt b/ydb/core/kqp/ut/pg/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/pg/CMakeLists.txt
+++ b/ydb/core/kqp/ut/pg/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/query/CMakeLists.darwin.txt b/ydb/core/kqp/ut/query/CMakeLists.darwin-x86_64.txt
index 873485e3df..873485e3df 100644
--- a/ydb/core/kqp/ut/query/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/query/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/query/CMakeLists.linux.txt b/ydb/core/kqp/ut/query/CMakeLists.linux-x86_64.txt
index 55ea11a270..55ea11a270 100644
--- a/ydb/core/kqp/ut/query/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/query/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/query/CMakeLists.txt b/ydb/core/kqp/ut/query/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/query/CMakeLists.txt
+++ b/ydb/core/kqp/ut/query/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/scan/CMakeLists.darwin.txt b/ydb/core/kqp/ut/scan/CMakeLists.darwin-x86_64.txt
index 79de1eb35b..79de1eb35b 100644
--- a/ydb/core/kqp/ut/scan/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/scan/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/scan/CMakeLists.linux.txt b/ydb/core/kqp/ut/scan/CMakeLists.linux-x86_64.txt
index bd7ff2f3bc..bd7ff2f3bc 100644
--- a/ydb/core/kqp/ut/scan/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/scan/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/scan/CMakeLists.txt b/ydb/core/kqp/ut/scan/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/scan/CMakeLists.txt
+++ b/ydb/core/kqp/ut/scan/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/scheme/CMakeLists.darwin.txt b/ydb/core/kqp/ut/scheme/CMakeLists.darwin-x86_64.txt
index 1637ad8ece..1637ad8ece 100644
--- a/ydb/core/kqp/ut/scheme/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/scheme/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/scheme/CMakeLists.linux.txt b/ydb/core/kqp/ut/scheme/CMakeLists.linux-x86_64.txt
index 4e0c22b3b3..4e0c22b3b3 100644
--- a/ydb/core/kqp/ut/scheme/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/scheme/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/scheme/CMakeLists.txt b/ydb/core/kqp/ut/scheme/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/scheme/CMakeLists.txt
+++ b/ydb/core/kqp/ut/scheme/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/service/CMakeLists.darwin.txt b/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt
index dd89cb1c07..dd89cb1c07 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/service/CMakeLists.linux.txt b/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt
index c7607947d4..c7607947d4 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/service/CMakeLists.txt b/ydb/core/kqp/ut/service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/service/CMakeLists.txt
+++ b/ydb/core/kqp/ut/service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/spilling/CMakeLists.darwin.txt b/ydb/core/kqp/ut/spilling/CMakeLists.darwin-x86_64.txt
index 8f5cba787d..8f5cba787d 100644
--- a/ydb/core/kqp/ut/spilling/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/spilling/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/spilling/CMakeLists.linux.txt b/ydb/core/kqp/ut/spilling/CMakeLists.linux-x86_64.txt
index cf3ba8d157..cf3ba8d157 100644
--- a/ydb/core/kqp/ut/spilling/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/spilling/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/spilling/CMakeLists.txt b/ydb/core/kqp/ut/spilling/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/spilling/CMakeLists.txt
+++ b/ydb/core/kqp/ut/spilling/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/sysview/CMakeLists.darwin.txt b/ydb/core/kqp/ut/sysview/CMakeLists.darwin-x86_64.txt
index 5eef2a397a..5eef2a397a 100644
--- a/ydb/core/kqp/ut/sysview/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/sysview/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/sysview/CMakeLists.linux.txt b/ydb/core/kqp/ut/sysview/CMakeLists.linux-x86_64.txt
index 140de062e2..140de062e2 100644
--- a/ydb/core/kqp/ut/sysview/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/sysview/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/sysview/CMakeLists.txt b/ydb/core/kqp/ut/sysview/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/sysview/CMakeLists.txt
+++ b/ydb/core/kqp/ut/sysview/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/tx/CMakeLists.darwin.txt b/ydb/core/kqp/ut/tx/CMakeLists.darwin-x86_64.txt
index b06230f45f..b06230f45f 100644
--- a/ydb/core/kqp/ut/tx/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/tx/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/tx/CMakeLists.linux.txt b/ydb/core/kqp/ut/tx/CMakeLists.linux-x86_64.txt
index acf83c3710..acf83c3710 100644
--- a/ydb/core/kqp/ut/tx/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/tx/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/tx/CMakeLists.txt b/ydb/core/kqp/ut/tx/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/tx/CMakeLists.txt
+++ b/ydb/core/kqp/ut/tx/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/kqp/ut/yql/CMakeLists.darwin.txt b/ydb/core/kqp/ut/yql/CMakeLists.darwin-x86_64.txt
index e3f7a36777..e3f7a36777 100644
--- a/ydb/core/kqp/ut/yql/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/yql/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/kqp/ut/yql/CMakeLists.linux.txt b/ydb/core/kqp/ut/yql/CMakeLists.linux-x86_64.txt
index 150203b375..150203b375 100644
--- a/ydb/core/kqp/ut/yql/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/yql/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/kqp/ut/yql/CMakeLists.txt b/ydb/core/kqp/ut/yql/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/kqp/ut/yql/CMakeLists.txt
+++ b/ydb/core/kqp/ut/yql/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/load_test/CMakeLists.darwin.txt b/ydb/core/load_test/CMakeLists.darwin-x86_64.txt
index 53c7051ec6..53c7051ec6 100644
--- a/ydb/core/load_test/CMakeLists.darwin.txt
+++ b/ydb/core/load_test/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/load_test/CMakeLists.linux.txt b/ydb/core/load_test/CMakeLists.linux-x86_64.txt
index edf344a5c5..edf344a5c5 100644
--- a/ydb/core/load_test/CMakeLists.linux.txt
+++ b/ydb/core/load_test/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/load_test/CMakeLists.txt b/ydb/core/load_test/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/load_test/CMakeLists.txt
+++ b/ydb/core/load_test/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/load_test/ut_ycsb/CMakeLists.darwin.txt b/ydb/core/load_test/ut_ycsb/CMakeLists.darwin-x86_64.txt
index 00586386e8..00586386e8 100644
--- a/ydb/core/load_test/ut_ycsb/CMakeLists.darwin.txt
+++ b/ydb/core/load_test/ut_ycsb/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/load_test/ut_ycsb/CMakeLists.linux.txt b/ydb/core/load_test/ut_ycsb/CMakeLists.linux-x86_64.txt
index 3c44ffb3c7..3c44ffb3c7 100644
--- a/ydb/core/load_test/ut_ycsb/CMakeLists.linux.txt
+++ b/ydb/core/load_test/ut_ycsb/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/load_test/ut_ycsb/CMakeLists.txt b/ydb/core/load_test/ut_ycsb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/load_test/ut_ycsb/CMakeLists.txt
+++ b/ydb/core/load_test/ut_ycsb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/log_backend/CMakeLists.darwin.txt b/ydb/core/log_backend/CMakeLists.darwin-x86_64.txt
index 94831d48f3..94831d48f3 100644
--- a/ydb/core/log_backend/CMakeLists.darwin.txt
+++ b/ydb/core/log_backend/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/log_backend/CMakeLists.linux.txt b/ydb/core/log_backend/CMakeLists.linux-x86_64.txt
index 57ef405c9b..57ef405c9b 100644
--- a/ydb/core/log_backend/CMakeLists.linux.txt
+++ b/ydb/core/log_backend/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/log_backend/CMakeLists.txt b/ydb/core/log_backend/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/log_backend/CMakeLists.txt
+++ b/ydb/core/log_backend/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/metering/CMakeLists.darwin.txt b/ydb/core/metering/CMakeLists.darwin-x86_64.txt
index f280441684..f280441684 100644
--- a/ydb/core/metering/CMakeLists.darwin.txt
+++ b/ydb/core/metering/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/metering/CMakeLists.linux.txt b/ydb/core/metering/CMakeLists.linux-x86_64.txt
index 8faa46da60..8faa46da60 100644
--- a/ydb/core/metering/CMakeLists.linux.txt
+++ b/ydb/core/metering/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/metering/CMakeLists.txt b/ydb/core/metering/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/metering/CMakeLists.txt
+++ b/ydb/core/metering/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/metering/ut/CMakeLists.darwin.txt b/ydb/core/metering/ut/CMakeLists.darwin-x86_64.txt
index 10fe0240e9..10fe0240e9 100644
--- a/ydb/core/metering/ut/CMakeLists.darwin.txt
+++ b/ydb/core/metering/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/metering/ut/CMakeLists.linux.txt b/ydb/core/metering/ut/CMakeLists.linux-x86_64.txt
index c50e640d5c..c50e640d5c 100644
--- a/ydb/core/metering/ut/CMakeLists.linux.txt
+++ b/ydb/core/metering/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/metering/ut/CMakeLists.txt b/ydb/core/metering/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/metering/ut/CMakeLists.txt
+++ b/ydb/core/metering/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/CMakeLists.darwin.txt b/ydb/core/mind/CMakeLists.darwin-x86_64.txt
index cf47982546..cf47982546 100644
--- a/ydb/core/mind/CMakeLists.darwin.txt
+++ b/ydb/core/mind/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/CMakeLists.linux.txt b/ydb/core/mind/CMakeLists.linux-x86_64.txt
index 0b52905853..0b52905853 100644
--- a/ydb/core/mind/CMakeLists.linux.txt
+++ b/ydb/core/mind/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/CMakeLists.txt b/ydb/core/mind/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/CMakeLists.txt
+++ b/ydb/core/mind/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/address_classification/CMakeLists.darwin.txt b/ydb/core/mind/address_classification/CMakeLists.darwin-x86_64.txt
index 17f76f5bf2..17f76f5bf2 100644
--- a/ydb/core/mind/address_classification/CMakeLists.darwin.txt
+++ b/ydb/core/mind/address_classification/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/address_classification/CMakeLists.linux.txt b/ydb/core/mind/address_classification/CMakeLists.linux-x86_64.txt
index 306c46c6d0..306c46c6d0 100644
--- a/ydb/core/mind/address_classification/CMakeLists.linux.txt
+++ b/ydb/core/mind/address_classification/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/address_classification/CMakeLists.txt b/ydb/core/mind/address_classification/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/address_classification/CMakeLists.txt
+++ b/ydb/core/mind/address_classification/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/address_classification/ut/CMakeLists.darwin.txt b/ydb/core/mind/address_classification/ut/CMakeLists.darwin-x86_64.txt
index 4b909d6e21..4b909d6e21 100644
--- a/ydb/core/mind/address_classification/ut/CMakeLists.darwin.txt
+++ b/ydb/core/mind/address_classification/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/address_classification/ut/CMakeLists.linux.txt b/ydb/core/mind/address_classification/ut/CMakeLists.linux-x86_64.txt
index 02db43d4bf..02db43d4bf 100644
--- a/ydb/core/mind/address_classification/ut/CMakeLists.linux.txt
+++ b/ydb/core/mind/address_classification/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/address_classification/ut/CMakeLists.txt b/ydb/core/mind/address_classification/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/address_classification/ut/CMakeLists.txt
+++ b/ydb/core/mind/address_classification/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/bscontroller/CMakeLists.darwin.txt b/ydb/core/mind/bscontroller/CMakeLists.darwin-x86_64.txt
index 29efd0a407..29efd0a407 100644
--- a/ydb/core/mind/bscontroller/CMakeLists.darwin.txt
+++ b/ydb/core/mind/bscontroller/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/bscontroller/CMakeLists.linux.txt b/ydb/core/mind/bscontroller/CMakeLists.linux-x86_64.txt
index a7dfc9839c..a7dfc9839c 100644
--- a/ydb/core/mind/bscontroller/CMakeLists.linux.txt
+++ b/ydb/core/mind/bscontroller/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/bscontroller/CMakeLists.txt b/ydb/core/mind/bscontroller/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/bscontroller/CMakeLists.txt
+++ b/ydb/core/mind/bscontroller/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/bscontroller/ut/CMakeLists.darwin.txt b/ydb/core/mind/bscontroller/ut/CMakeLists.darwin-x86_64.txt
index c4aaaed962..c4aaaed962 100644
--- a/ydb/core/mind/bscontroller/ut/CMakeLists.darwin.txt
+++ b/ydb/core/mind/bscontroller/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/bscontroller/ut/CMakeLists.linux.txt b/ydb/core/mind/bscontroller/ut/CMakeLists.linux-x86_64.txt
index 47cc95548e..47cc95548e 100644
--- a/ydb/core/mind/bscontroller/ut/CMakeLists.linux.txt
+++ b/ydb/core/mind/bscontroller/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/bscontroller/ut/CMakeLists.txt b/ydb/core/mind/bscontroller/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/bscontroller/ut/CMakeLists.txt
+++ b/ydb/core/mind/bscontroller/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.darwin.txt b/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.darwin-x86_64.txt
index f037fb77b3..f037fb77b3 100644
--- a/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.darwin.txt
+++ b/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.linux.txt b/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.linux-x86_64.txt
index 709ef88321..709ef88321 100644
--- a/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.linux.txt
+++ b/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.txt b/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.txt
+++ b/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.darwin.txt b/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.darwin-x86_64.txt
index cffbc5e45d..cffbc5e45d 100644
--- a/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.darwin.txt
+++ b/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.linux.txt b/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.linux-x86_64.txt
index bf1ec3e67c..bf1ec3e67c 100644
--- a/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.linux.txt
+++ b/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.txt b/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.txt
+++ b/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/hive/CMakeLists.darwin.txt b/ydb/core/mind/hive/CMakeLists.darwin-x86_64.txt
index 381f98c0bb..381f98c0bb 100644
--- a/ydb/core/mind/hive/CMakeLists.darwin.txt
+++ b/ydb/core/mind/hive/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/hive/CMakeLists.linux.txt b/ydb/core/mind/hive/CMakeLists.linux-x86_64.txt
index 78002d5729..78002d5729 100644
--- a/ydb/core/mind/hive/CMakeLists.linux.txt
+++ b/ydb/core/mind/hive/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/hive/CMakeLists.txt b/ydb/core/mind/hive/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/hive/CMakeLists.txt
+++ b/ydb/core/mind/hive/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/hive/ut/CMakeLists.darwin.txt b/ydb/core/mind/hive/ut/CMakeLists.darwin-x86_64.txt
index 53920c95fa..53920c95fa 100644
--- a/ydb/core/mind/hive/ut/CMakeLists.darwin.txt
+++ b/ydb/core/mind/hive/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/hive/ut/CMakeLists.linux.txt b/ydb/core/mind/hive/ut/CMakeLists.linux-x86_64.txt
index 6e1fe78e22..6e1fe78e22 100644
--- a/ydb/core/mind/hive/ut/CMakeLists.linux.txt
+++ b/ydb/core/mind/hive/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/hive/ut/CMakeLists.txt b/ydb/core/mind/hive/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/hive/ut/CMakeLists.txt
+++ b/ydb/core/mind/hive/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/ut/CMakeLists.darwin.txt b/ydb/core/mind/ut/CMakeLists.darwin-x86_64.txt
index a3dc8cba2c..a3dc8cba2c 100644
--- a/ydb/core/mind/ut/CMakeLists.darwin.txt
+++ b/ydb/core/mind/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/ut/CMakeLists.linux.txt b/ydb/core/mind/ut/CMakeLists.linux-x86_64.txt
index 611a4b83d7..611a4b83d7 100644
--- a/ydb/core/mind/ut/CMakeLists.linux.txt
+++ b/ydb/core/mind/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/ut/CMakeLists.txt b/ydb/core/mind/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/ut/CMakeLists.txt
+++ b/ydb/core/mind/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mind/ut_fat/CMakeLists.darwin.txt b/ydb/core/mind/ut_fat/CMakeLists.darwin-x86_64.txt
index 660e37516a..660e37516a 100644
--- a/ydb/core/mind/ut_fat/CMakeLists.darwin.txt
+++ b/ydb/core/mind/ut_fat/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mind/ut_fat/CMakeLists.linux.txt b/ydb/core/mind/ut_fat/CMakeLists.linux-x86_64.txt
index c450dbc15e..c450dbc15e 100644
--- a/ydb/core/mind/ut_fat/CMakeLists.linux.txt
+++ b/ydb/core/mind/ut_fat/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mind/ut_fat/CMakeLists.txt b/ydb/core/mind/ut_fat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mind/ut_fat/CMakeLists.txt
+++ b/ydb/core/mind/ut_fat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mon/CMakeLists.darwin.txt b/ydb/core/mon/CMakeLists.darwin-x86_64.txt
index fee6b631b2..fee6b631b2 100644
--- a/ydb/core/mon/CMakeLists.darwin.txt
+++ b/ydb/core/mon/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mon/CMakeLists.linux.txt b/ydb/core/mon/CMakeLists.linux-x86_64.txt
index 30901ee692..30901ee692 100644
--- a/ydb/core/mon/CMakeLists.linux.txt
+++ b/ydb/core/mon/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mon/CMakeLists.txt b/ydb/core/mon/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mon/CMakeLists.txt
+++ b/ydb/core/mon/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/mon_alloc/CMakeLists.darwin.txt b/ydb/core/mon_alloc/CMakeLists.darwin-x86_64.txt
index 76a8322a60..76a8322a60 100644
--- a/ydb/core/mon_alloc/CMakeLists.darwin.txt
+++ b/ydb/core/mon_alloc/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/mon_alloc/CMakeLists.linux.txt b/ydb/core/mon_alloc/CMakeLists.linux-x86_64.txt
index 242c4e3705..242c4e3705 100644
--- a/ydb/core/mon_alloc/CMakeLists.linux.txt
+++ b/ydb/core/mon_alloc/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/mon_alloc/CMakeLists.txt b/ydb/core/mon_alloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/mon_alloc/CMakeLists.txt
+++ b/ydb/core/mon_alloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/node_whiteboard/CMakeLists.darwin.txt b/ydb/core/node_whiteboard/CMakeLists.darwin-x86_64.txt
index 5602840318..5602840318 100644
--- a/ydb/core/node_whiteboard/CMakeLists.darwin.txt
+++ b/ydb/core/node_whiteboard/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/node_whiteboard/CMakeLists.linux.txt b/ydb/core/node_whiteboard/CMakeLists.linux-x86_64.txt
index 1a95d9c13d..1a95d9c13d 100644
--- a/ydb/core/node_whiteboard/CMakeLists.linux.txt
+++ b/ydb/core/node_whiteboard/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/node_whiteboard/CMakeLists.txt b/ydb/core/node_whiteboard/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/node_whiteboard/CMakeLists.txt
+++ b/ydb/core/node_whiteboard/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/CMakeLists.darwin.txt b/ydb/core/persqueue/CMakeLists.darwin-x86_64.txt
index a2ae4317b1..a2ae4317b1 100644
--- a/ydb/core/persqueue/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/CMakeLists.linux.txt b/ydb/core/persqueue/CMakeLists.linux-x86_64.txt
index 017ec968c3..017ec968c3 100644
--- a/ydb/core/persqueue/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/CMakeLists.txt b/ydb/core/persqueue/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/CMakeLists.txt
+++ b/ydb/core/persqueue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/codecs/CMakeLists.darwin.txt b/ydb/core/persqueue/codecs/CMakeLists.darwin-x86_64.txt
index 06d39d1b16..06d39d1b16 100644
--- a/ydb/core/persqueue/codecs/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/codecs/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/codecs/CMakeLists.linux.txt b/ydb/core/persqueue/codecs/CMakeLists.linux-x86_64.txt
index 99a1af484e..99a1af484e 100644
--- a/ydb/core/persqueue/codecs/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/codecs/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/codecs/CMakeLists.txt b/ydb/core/persqueue/codecs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/codecs/CMakeLists.txt
+++ b/ydb/core/persqueue/codecs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/config/CMakeLists.darwin.txt b/ydb/core/persqueue/config/CMakeLists.darwin-x86_64.txt
index 197328427c..197328427c 100644
--- a/ydb/core/persqueue/config/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/config/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/config/CMakeLists.linux.txt b/ydb/core/persqueue/config/CMakeLists.linux-x86_64.txt
index af94c1e823..af94c1e823 100644
--- a/ydb/core/persqueue/config/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/config/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/config/CMakeLists.txt b/ydb/core/persqueue/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/config/CMakeLists.txt
+++ b/ydb/core/persqueue/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/events/CMakeLists.darwin.txt b/ydb/core/persqueue/events/CMakeLists.darwin-x86_64.txt
index d3a3f2cf37..d3a3f2cf37 100644
--- a/ydb/core/persqueue/events/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/events/CMakeLists.linux.txt b/ydb/core/persqueue/events/CMakeLists.linux-x86_64.txt
index 1e58965269..1e58965269 100644
--- a/ydb/core/persqueue/events/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/events/CMakeLists.txt b/ydb/core/persqueue/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/events/CMakeLists.txt
+++ b/ydb/core/persqueue/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/partition_key_range/CMakeLists.darwin.txt b/ydb/core/persqueue/partition_key_range/CMakeLists.darwin-x86_64.txt
index a43bf08617..a43bf08617 100644
--- a/ydb/core/persqueue/partition_key_range/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/partition_key_range/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/partition_key_range/CMakeLists.linux.txt b/ydb/core/persqueue/partition_key_range/CMakeLists.linux-x86_64.txt
index 5ec3d2b867..5ec3d2b867 100644
--- a/ydb/core/persqueue/partition_key_range/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/partition_key_range/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/partition_key_range/CMakeLists.txt b/ydb/core/persqueue/partition_key_range/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/partition_key_range/CMakeLists.txt
+++ b/ydb/core/persqueue/partition_key_range/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/ut/CMakeLists.darwin.txt b/ydb/core/persqueue/ut/CMakeLists.darwin-x86_64.txt
index fd9c7e5a3b..fd9c7e5a3b 100644
--- a/ydb/core/persqueue/ut/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/ut/CMakeLists.linux.txt b/ydb/core/persqueue/ut/CMakeLists.linux-x86_64.txt
index a02afb4476..a02afb4476 100644
--- a/ydb/core/persqueue/ut/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/ut/CMakeLists.txt b/ydb/core/persqueue/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/ut/CMakeLists.txt
+++ b/ydb/core/persqueue/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/ut/common/CMakeLists.darwin.txt b/ydb/core/persqueue/ut/common/CMakeLists.darwin-x86_64.txt
index f398910fc5..f398910fc5 100644
--- a/ydb/core/persqueue/ut/common/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/ut/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/ut/common/CMakeLists.linux.txt b/ydb/core/persqueue/ut/common/CMakeLists.linux-x86_64.txt
index a533a7288d..a533a7288d 100644
--- a/ydb/core/persqueue/ut/common/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/ut/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/ut/common/CMakeLists.txt b/ydb/core/persqueue/ut/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/ut/common/CMakeLists.txt
+++ b/ydb/core/persqueue/ut/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/ut/slow/CMakeLists.darwin.txt b/ydb/core/persqueue/ut/slow/CMakeLists.darwin-x86_64.txt
index e7424b3123..e7424b3123 100644
--- a/ydb/core/persqueue/ut/slow/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/ut/slow/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/ut/slow/CMakeLists.linux.txt b/ydb/core/persqueue/ut/slow/CMakeLists.linux-x86_64.txt
index 24d1481125..24d1481125 100644
--- a/ydb/core/persqueue/ut/slow/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/ut/slow/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/ut/slow/CMakeLists.txt b/ydb/core/persqueue/ut/slow/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/ut/slow/CMakeLists.txt
+++ b/ydb/core/persqueue/ut/slow/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/persqueue/writer/CMakeLists.darwin.txt b/ydb/core/persqueue/writer/CMakeLists.darwin-x86_64.txt
index facc5b0ca5..facc5b0ca5 100644
--- a/ydb/core/persqueue/writer/CMakeLists.darwin.txt
+++ b/ydb/core/persqueue/writer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/persqueue/writer/CMakeLists.linux.txt b/ydb/core/persqueue/writer/CMakeLists.linux-x86_64.txt
index 64893626e2..64893626e2 100644
--- a/ydb/core/persqueue/writer/CMakeLists.linux.txt
+++ b/ydb/core/persqueue/writer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/persqueue/writer/CMakeLists.txt b/ydb/core/persqueue/writer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/persqueue/writer/CMakeLists.txt
+++ b/ydb/core/persqueue/writer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/pgproxy/CMakeLists.darwin.txt b/ydb/core/pgproxy/CMakeLists.darwin-x86_64.txt
index 1152f61502..1152f61502 100644
--- a/ydb/core/pgproxy/CMakeLists.darwin.txt
+++ b/ydb/core/pgproxy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/pgproxy/CMakeLists.linux.txt b/ydb/core/pgproxy/CMakeLists.linux-x86_64.txt
index 2a7b6d732b..2a7b6d732b 100644
--- a/ydb/core/pgproxy/CMakeLists.linux.txt
+++ b/ydb/core/pgproxy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/pgproxy/CMakeLists.txt b/ydb/core/pgproxy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/pgproxy/CMakeLists.txt
+++ b/ydb/core/pgproxy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/pgproxy/ut/CMakeLists.darwin.txt b/ydb/core/pgproxy/ut/CMakeLists.darwin-x86_64.txt
index 1d47b8ab38..1d47b8ab38 100644
--- a/ydb/core/pgproxy/ut/CMakeLists.darwin.txt
+++ b/ydb/core/pgproxy/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/pgproxy/ut/CMakeLists.linux.txt b/ydb/core/pgproxy/ut/CMakeLists.linux-x86_64.txt
index 72aac702c8..72aac702c8 100644
--- a/ydb/core/pgproxy/ut/CMakeLists.linux.txt
+++ b/ydb/core/pgproxy/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/pgproxy/ut/CMakeLists.txt b/ydb/core/pgproxy/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/pgproxy/ut/CMakeLists.txt
+++ b/ydb/core/pgproxy/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/protos/CMakeLists.darwin.txt b/ydb/core/protos/CMakeLists.darwin-x86_64.txt
index ca69a6fd6b..ca69a6fd6b 100644
--- a/ydb/core/protos/CMakeLists.darwin.txt
+++ b/ydb/core/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/protos/CMakeLists.linux.txt b/ydb/core/protos/CMakeLists.linux-x86_64.txt
index 10f1106fe5..10f1106fe5 100644
--- a/ydb/core/protos/CMakeLists.linux.txt
+++ b/ydb/core/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/protos/CMakeLists.txt b/ydb/core/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/protos/CMakeLists.txt
+++ b/ydb/core/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/protos/out/CMakeLists.darwin.txt b/ydb/core/protos/out/CMakeLists.darwin-x86_64.txt
index 75b16d3394..75b16d3394 100644
--- a/ydb/core/protos/out/CMakeLists.darwin.txt
+++ b/ydb/core/protos/out/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/protos/out/CMakeLists.linux.txt b/ydb/core/protos/out/CMakeLists.linux-x86_64.txt
index e080a9db95..e080a9db95 100644
--- a/ydb/core/protos/out/CMakeLists.linux.txt
+++ b/ydb/core/protos/out/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/protos/out/CMakeLists.txt b/ydb/core/protos/out/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/protos/out/CMakeLists.txt
+++ b/ydb/core/protos/out/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/public_http/CMakeLists.darwin.txt b/ydb/core/public_http/CMakeLists.darwin-x86_64.txt
index 8f1fc38295..8f1fc38295 100644
--- a/ydb/core/public_http/CMakeLists.darwin.txt
+++ b/ydb/core/public_http/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/public_http/CMakeLists.linux.txt b/ydb/core/public_http/CMakeLists.linux-x86_64.txt
index cac79fe9e4..cac79fe9e4 100644
--- a/ydb/core/public_http/CMakeLists.linux.txt
+++ b/ydb/core/public_http/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/public_http/CMakeLists.txt b/ydb/core/public_http/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/public_http/CMakeLists.txt
+++ b/ydb/core/public_http/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/public_http/protos/CMakeLists.darwin.txt b/ydb/core/public_http/protos/CMakeLists.darwin-x86_64.txt
index 69379327d8..69379327d8 100644
--- a/ydb/core/public_http/protos/CMakeLists.darwin.txt
+++ b/ydb/core/public_http/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/public_http/protos/CMakeLists.linux.txt b/ydb/core/public_http/protos/CMakeLists.linux-x86_64.txt
index 55f98c96cb..55f98c96cb 100644
--- a/ydb/core/public_http/protos/CMakeLists.linux.txt
+++ b/ydb/core/public_http/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/public_http/protos/CMakeLists.txt b/ydb/core/public_http/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/public_http/protos/CMakeLists.txt
+++ b/ydb/core/public_http/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/public_http/ut/CMakeLists.darwin.txt b/ydb/core/public_http/ut/CMakeLists.darwin-x86_64.txt
index cd392faf07..cd392faf07 100644
--- a/ydb/core/public_http/ut/CMakeLists.darwin.txt
+++ b/ydb/core/public_http/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/public_http/ut/CMakeLists.linux.txt b/ydb/core/public_http/ut/CMakeLists.linux-x86_64.txt
index a9a28e7788..a9a28e7788 100644
--- a/ydb/core/public_http/ut/CMakeLists.linux.txt
+++ b/ydb/core/public_http/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/public_http/ut/CMakeLists.txt b/ydb/core/public_http/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/public_http/ut/CMakeLists.txt
+++ b/ydb/core/public_http/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/quoter/CMakeLists.darwin.txt b/ydb/core/quoter/CMakeLists.darwin-x86_64.txt
index 944c9b9fff..944c9b9fff 100644
--- a/ydb/core/quoter/CMakeLists.darwin.txt
+++ b/ydb/core/quoter/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/quoter/CMakeLists.linux.txt b/ydb/core/quoter/CMakeLists.linux-x86_64.txt
index 3bd282f84d..3bd282f84d 100644
--- a/ydb/core/quoter/CMakeLists.linux.txt
+++ b/ydb/core/quoter/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/quoter/CMakeLists.txt b/ydb/core/quoter/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/quoter/CMakeLists.txt
+++ b/ydb/core/quoter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.darwin.txt b/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.darwin-x86_64.txt
index d3840947c7..d3840947c7 100644
--- a/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.darwin.txt
+++ b/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.linux.txt b/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.linux-x86_64.txt
index 58b7d74728..58b7d74728 100644
--- a/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.linux.txt
+++ b/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.txt b/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.txt
+++ b/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/quoter/ut/CMakeLists.darwin.txt b/ydb/core/quoter/ut/CMakeLists.darwin-x86_64.txt
index f55b039e80..f55b039e80 100644
--- a/ydb/core/quoter/ut/CMakeLists.darwin.txt
+++ b/ydb/core/quoter/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/quoter/ut/CMakeLists.linux.txt b/ydb/core/quoter/ut/CMakeLists.linux-x86_64.txt
index 73b14cd7cd..73b14cd7cd 100644
--- a/ydb/core/quoter/ut/CMakeLists.linux.txt
+++ b/ydb/core/quoter/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/quoter/ut/CMakeLists.txt b/ydb/core/quoter/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/quoter/ut/CMakeLists.txt
+++ b/ydb/core/quoter/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/scheme/CMakeLists.darwin.txt b/ydb/core/scheme/CMakeLists.darwin-x86_64.txt
index 82ba1fccb1..82ba1fccb1 100644
--- a/ydb/core/scheme/CMakeLists.darwin.txt
+++ b/ydb/core/scheme/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/scheme/CMakeLists.linux.txt b/ydb/core/scheme/CMakeLists.linux-x86_64.txt
index 98cdbeea4a..98cdbeea4a 100644
--- a/ydb/core/scheme/CMakeLists.linux.txt
+++ b/ydb/core/scheme/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/scheme/CMakeLists.txt b/ydb/core/scheme/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/scheme/CMakeLists.txt
+++ b/ydb/core/scheme/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/scheme/ut/CMakeLists.darwin.txt b/ydb/core/scheme/ut/CMakeLists.darwin-x86_64.txt
index 2d48b53bc2..2d48b53bc2 100644
--- a/ydb/core/scheme/ut/CMakeLists.darwin.txt
+++ b/ydb/core/scheme/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/scheme/ut/CMakeLists.linux.txt b/ydb/core/scheme/ut/CMakeLists.linux-x86_64.txt
index d6dc4618e3..d6dc4618e3 100644
--- a/ydb/core/scheme/ut/CMakeLists.linux.txt
+++ b/ydb/core/scheme/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/scheme/ut/CMakeLists.txt b/ydb/core/scheme/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/scheme/ut/CMakeLists.txt
+++ b/ydb/core/scheme/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/scheme_types/CMakeLists.darwin.txt b/ydb/core/scheme_types/CMakeLists.darwin-x86_64.txt
index 210c5626fc..210c5626fc 100644
--- a/ydb/core/scheme_types/CMakeLists.darwin.txt
+++ b/ydb/core/scheme_types/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/scheme_types/CMakeLists.linux.txt b/ydb/core/scheme_types/CMakeLists.linux-x86_64.txt
index 36d765b6c8..36d765b6c8 100644
--- a/ydb/core/scheme_types/CMakeLists.linux.txt
+++ b/ydb/core/scheme_types/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/scheme_types/CMakeLists.txt b/ydb/core/scheme_types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/scheme_types/CMakeLists.txt
+++ b/ydb/core/scheme_types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/security/CMakeLists.darwin.txt b/ydb/core/security/CMakeLists.darwin-x86_64.txt
index 833a67dafc..833a67dafc 100644
--- a/ydb/core/security/CMakeLists.darwin.txt
+++ b/ydb/core/security/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/security/CMakeLists.linux.txt b/ydb/core/security/CMakeLists.linux-x86_64.txt
index bef8933463..bef8933463 100644
--- a/ydb/core/security/CMakeLists.linux.txt
+++ b/ydb/core/security/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/security/CMakeLists.txt b/ydb/core/security/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/security/CMakeLists.txt
+++ b/ydb/core/security/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/security/ut/CMakeLists.darwin.txt b/ydb/core/security/ut/CMakeLists.darwin-x86_64.txt
index 7765f27978..7765f27978 100644
--- a/ydb/core/security/ut/CMakeLists.darwin.txt
+++ b/ydb/core/security/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/security/ut/CMakeLists.linux.txt b/ydb/core/security/ut/CMakeLists.linux-x86_64.txt
index 42d399ab95..42d399ab95 100644
--- a/ydb/core/security/ut/CMakeLists.linux.txt
+++ b/ydb/core/security/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/security/ut/CMakeLists.txt b/ydb/core/security/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/security/ut/CMakeLists.txt
+++ b/ydb/core/security/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/CMakeLists.darwin.txt b/ydb/core/sys_view/CMakeLists.darwin-x86_64.txt
index 79cb54391a..79cb54391a 100644
--- a/ydb/core/sys_view/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/CMakeLists.linux.txt b/ydb/core/sys_view/CMakeLists.linux-x86_64.txt
index b8c03c3cd7..b8c03c3cd7 100644
--- a/ydb/core/sys_view/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/CMakeLists.txt b/ydb/core/sys_view/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/CMakeLists.txt
+++ b/ydb/core/sys_view/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/common/CMakeLists.darwin.txt b/ydb/core/sys_view/common/CMakeLists.darwin-x86_64.txt
index cf19da8bae..cf19da8bae 100644
--- a/ydb/core/sys_view/common/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/common/CMakeLists.linux.txt b/ydb/core/sys_view/common/CMakeLists.linux-x86_64.txt
index b0562b9d36..b0562b9d36 100644
--- a/ydb/core/sys_view/common/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/common/CMakeLists.txt b/ydb/core/sys_view/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/common/CMakeLists.txt
+++ b/ydb/core/sys_view/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/nodes/CMakeLists.darwin.txt b/ydb/core/sys_view/nodes/CMakeLists.darwin-x86_64.txt
index 8312dc7532..8312dc7532 100644
--- a/ydb/core/sys_view/nodes/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/nodes/CMakeLists.linux.txt b/ydb/core/sys_view/nodes/CMakeLists.linux-x86_64.txt
index 3ae49315c7..3ae49315c7 100644
--- a/ydb/core/sys_view/nodes/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/nodes/CMakeLists.txt b/ydb/core/sys_view/nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/nodes/CMakeLists.txt
+++ b/ydb/core/sys_view/nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/partition_stats/CMakeLists.darwin.txt b/ydb/core/sys_view/partition_stats/CMakeLists.darwin-x86_64.txt
index 88faa7f7f8..88faa7f7f8 100644
--- a/ydb/core/sys_view/partition_stats/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/partition_stats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/partition_stats/CMakeLists.linux.txt b/ydb/core/sys_view/partition_stats/CMakeLists.linux-x86_64.txt
index 1282f3c33b..1282f3c33b 100644
--- a/ydb/core/sys_view/partition_stats/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/partition_stats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/partition_stats/CMakeLists.txt b/ydb/core/sys_view/partition_stats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/partition_stats/CMakeLists.txt
+++ b/ydb/core/sys_view/partition_stats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/partition_stats/ut/CMakeLists.darwin.txt b/ydb/core/sys_view/partition_stats/ut/CMakeLists.darwin-x86_64.txt
index c4de385ef4..c4de385ef4 100644
--- a/ydb/core/sys_view/partition_stats/ut/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/partition_stats/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/partition_stats/ut/CMakeLists.linux.txt b/ydb/core/sys_view/partition_stats/ut/CMakeLists.linux-x86_64.txt
index 3d2adfc6bf..3d2adfc6bf 100644
--- a/ydb/core/sys_view/partition_stats/ut/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/partition_stats/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/partition_stats/ut/CMakeLists.txt b/ydb/core/sys_view/partition_stats/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/partition_stats/ut/CMakeLists.txt
+++ b/ydb/core/sys_view/partition_stats/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/processor/CMakeLists.darwin.txt b/ydb/core/sys_view/processor/CMakeLists.darwin-x86_64.txt
index 1416bcdbe8..1416bcdbe8 100644
--- a/ydb/core/sys_view/processor/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/processor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/processor/CMakeLists.linux.txt b/ydb/core/sys_view/processor/CMakeLists.linux-x86_64.txt
index aa745310f9..aa745310f9 100644
--- a/ydb/core/sys_view/processor/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/processor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/processor/CMakeLists.txt b/ydb/core/sys_view/processor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/processor/CMakeLists.txt
+++ b/ydb/core/sys_view/processor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/query_stats/CMakeLists.darwin.txt b/ydb/core/sys_view/query_stats/CMakeLists.darwin-x86_64.txt
index eece0034f8..eece0034f8 100644
--- a/ydb/core/sys_view/query_stats/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/query_stats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/query_stats/CMakeLists.linux.txt b/ydb/core/sys_view/query_stats/CMakeLists.linux-x86_64.txt
index 16df0e1481..16df0e1481 100644
--- a/ydb/core/sys_view/query_stats/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/query_stats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/query_stats/CMakeLists.txt b/ydb/core/sys_view/query_stats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/query_stats/CMakeLists.txt
+++ b/ydb/core/sys_view/query_stats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/query_stats/ut/CMakeLists.darwin.txt b/ydb/core/sys_view/query_stats/ut/CMakeLists.darwin-x86_64.txt
index 799a884ec2..799a884ec2 100644
--- a/ydb/core/sys_view/query_stats/ut/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/query_stats/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/query_stats/ut/CMakeLists.linux.txt b/ydb/core/sys_view/query_stats/ut/CMakeLists.linux-x86_64.txt
index a757399d4c..a757399d4c 100644
--- a/ydb/core/sys_view/query_stats/ut/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/query_stats/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/query_stats/ut/CMakeLists.txt b/ydb/core/sys_view/query_stats/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/query_stats/ut/CMakeLists.txt
+++ b/ydb/core/sys_view/query_stats/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/service/CMakeLists.darwin.txt b/ydb/core/sys_view/service/CMakeLists.darwin-x86_64.txt
index 1e55c4dae7..1e55c4dae7 100644
--- a/ydb/core/sys_view/service/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/service/CMakeLists.linux.txt b/ydb/core/sys_view/service/CMakeLists.linux-x86_64.txt
index f4765b088f..f4765b088f 100644
--- a/ydb/core/sys_view/service/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/service/CMakeLists.txt b/ydb/core/sys_view/service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/service/CMakeLists.txt
+++ b/ydb/core/sys_view/service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/service/ut/CMakeLists.darwin.txt b/ydb/core/sys_view/service/ut/CMakeLists.darwin-x86_64.txt
index 8b7e054efa..8b7e054efa 100644
--- a/ydb/core/sys_view/service/ut/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/service/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/service/ut/CMakeLists.linux.txt b/ydb/core/sys_view/service/ut/CMakeLists.linux-x86_64.txt
index acf8078ed2..acf8078ed2 100644
--- a/ydb/core/sys_view/service/ut/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/service/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/service/ut/CMakeLists.txt b/ydb/core/sys_view/service/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/service/ut/CMakeLists.txt
+++ b/ydb/core/sys_view/service/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/storage/CMakeLists.darwin.txt b/ydb/core/sys_view/storage/CMakeLists.darwin-x86_64.txt
index 4a5f608797..4a5f608797 100644
--- a/ydb/core/sys_view/storage/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/storage/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/storage/CMakeLists.linux.txt b/ydb/core/sys_view/storage/CMakeLists.linux-x86_64.txt
index 391ef896dd..391ef896dd 100644
--- a/ydb/core/sys_view/storage/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/storage/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/storage/CMakeLists.txt b/ydb/core/sys_view/storage/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/storage/CMakeLists.txt
+++ b/ydb/core/sys_view/storage/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/tablets/CMakeLists.darwin.txt b/ydb/core/sys_view/tablets/CMakeLists.darwin-x86_64.txt
index 001a1930e2..001a1930e2 100644
--- a/ydb/core/sys_view/tablets/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/tablets/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/tablets/CMakeLists.linux.txt b/ydb/core/sys_view/tablets/CMakeLists.linux-x86_64.txt
index babb0ef42d..babb0ef42d 100644
--- a/ydb/core/sys_view/tablets/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/tablets/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/tablets/CMakeLists.txt b/ydb/core/sys_view/tablets/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/tablets/CMakeLists.txt
+++ b/ydb/core/sys_view/tablets/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/sys_view/ut_kqp/CMakeLists.darwin.txt b/ydb/core/sys_view/ut_kqp/CMakeLists.darwin-x86_64.txt
index 057c70b305..057c70b305 100644
--- a/ydb/core/sys_view/ut_kqp/CMakeLists.darwin.txt
+++ b/ydb/core/sys_view/ut_kqp/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/sys_view/ut_kqp/CMakeLists.linux.txt b/ydb/core/sys_view/ut_kqp/CMakeLists.linux-x86_64.txt
index 847436e4fe..847436e4fe 100644
--- a/ydb/core/sys_view/ut_kqp/CMakeLists.linux.txt
+++ b/ydb/core/sys_view/ut_kqp/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/sys_view/ut_kqp/CMakeLists.txt b/ydb/core/sys_view/ut_kqp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/sys_view/ut_kqp/CMakeLists.txt
+++ b/ydb/core/sys_view/ut_kqp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet/CMakeLists.darwin.txt b/ydb/core/tablet/CMakeLists.darwin-x86_64.txt
index a00d85cb7d..a00d85cb7d 100644
--- a/ydb/core/tablet/CMakeLists.darwin.txt
+++ b/ydb/core/tablet/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet/CMakeLists.linux.txt b/ydb/core/tablet/CMakeLists.linux-x86_64.txt
index 1143b1cf62..1143b1cf62 100644
--- a/ydb/core/tablet/CMakeLists.linux.txt
+++ b/ydb/core/tablet/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet/CMakeLists.txt b/ydb/core/tablet/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet/CMakeLists.txt
+++ b/ydb/core/tablet/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet/ut/CMakeLists.darwin.txt b/ydb/core/tablet/ut/CMakeLists.darwin-x86_64.txt
index 4c447e0f3f..4c447e0f3f 100644
--- a/ydb/core/tablet/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tablet/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet/ut/CMakeLists.linux.txt b/ydb/core/tablet/ut/CMakeLists.linux-x86_64.txt
index 309b68d490..309b68d490 100644
--- a/ydb/core/tablet/ut/CMakeLists.linux.txt
+++ b/ydb/core/tablet/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet/ut/CMakeLists.txt b/ydb/core/tablet/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet/ut/CMakeLists.txt
+++ b/ydb/core/tablet/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/CMakeLists.darwin.txt b/ydb/core/tablet_flat/CMakeLists.darwin-x86_64.txt
index a7e948070e..a7e948070e 100644
--- a/ydb/core/tablet_flat/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/CMakeLists.linux.txt b/ydb/core/tablet_flat/CMakeLists.linux-x86_64.txt
index e4ade3f8a9..e4ade3f8a9 100644
--- a/ydb/core/tablet_flat/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/CMakeLists.txt b/ydb/core/tablet_flat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/CMakeLists.txt
+++ b/ydb/core/tablet_flat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/protos/CMakeLists.darwin.txt b/ydb/core/tablet_flat/protos/CMakeLists.darwin-x86_64.txt
index f018a876e4..f018a876e4 100644
--- a/ydb/core/tablet_flat/protos/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/protos/CMakeLists.linux.txt b/ydb/core/tablet_flat/protos/CMakeLists.linux-x86_64.txt
index ad30547f6b..ad30547f6b 100644
--- a/ydb/core/tablet_flat/protos/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/protos/CMakeLists.txt b/ydb/core/tablet_flat/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/protos/CMakeLists.txt
+++ b/ydb/core/tablet_flat/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/test/libs/exec/CMakeLists.darwin.txt b/ydb/core/tablet_flat/test/libs/exec/CMakeLists.darwin-x86_64.txt
index f08cfe6755..f08cfe6755 100644
--- a/ydb/core/tablet_flat/test/libs/exec/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/test/libs/exec/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/libs/exec/CMakeLists.linux.txt b/ydb/core/tablet_flat/test/libs/exec/CMakeLists.linux-x86_64.txt
index e9f0680f06..e9f0680f06 100644
--- a/ydb/core/tablet_flat/test/libs/exec/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/test/libs/exec/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/libs/exec/CMakeLists.txt b/ydb/core/tablet_flat/test/libs/exec/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/test/libs/exec/CMakeLists.txt
+++ b/ydb/core/tablet_flat/test/libs/exec/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/test/libs/rows/CMakeLists.darwin.txt b/ydb/core/tablet_flat/test/libs/rows/CMakeLists.darwin-x86_64.txt
index 3919df16d8..3919df16d8 100644
--- a/ydb/core/tablet_flat/test/libs/rows/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/test/libs/rows/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/libs/rows/CMakeLists.linux.txt b/ydb/core/tablet_flat/test/libs/rows/CMakeLists.linux-x86_64.txt
index 14b9a1cff3..14b9a1cff3 100644
--- a/ydb/core/tablet_flat/test/libs/rows/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/test/libs/rows/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/libs/rows/CMakeLists.txt b/ydb/core/tablet_flat/test/libs/rows/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/test/libs/rows/CMakeLists.txt
+++ b/ydb/core/tablet_flat/test/libs/rows/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/test/libs/table/CMakeLists.darwin.txt b/ydb/core/tablet_flat/test/libs/table/CMakeLists.darwin-x86_64.txt
index ab7b86db4b..ab7b86db4b 100644
--- a/ydb/core/tablet_flat/test/libs/table/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/test/libs/table/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/libs/table/CMakeLists.linux.txt b/ydb/core/tablet_flat/test/libs/table/CMakeLists.linux-x86_64.txt
index 0030fd5762..0030fd5762 100644
--- a/ydb/core/tablet_flat/test/libs/table/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/test/libs/table/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/libs/table/CMakeLists.txt b/ydb/core/tablet_flat/test/libs/table/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/test/libs/table/CMakeLists.txt
+++ b/ydb/core/tablet_flat/test/libs/table/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.darwin.txt b/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.darwin-x86_64.txt
index 970f0fd9cc..970f0fd9cc 100644
--- a/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.linux.txt b/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.linux-x86_64.txt
index d6a54ae5aa..d6a54ae5aa 100644
--- a/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.txt b/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.txt
+++ b/ydb/core/tablet_flat/test/libs/table/model/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.darwin.txt b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.darwin-x86_64.txt
index e5c0bca0f4..e5c0bca0f4 100644
--- a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.linux.txt b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.linux-x86_64.txt
index 1738debc18..1738debc18 100644
--- a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt
+++ b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.darwin.txt b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.darwin-x86_64.txt
index 706f39e0b0..706f39e0b0 100644
--- a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.linux.txt b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.linux-x86_64.txt
index 4bf1d56faa..4bf1d56faa 100644
--- a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt
+++ b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/ut/CMakeLists.darwin.txt b/ydb/core/tablet_flat/ut/CMakeLists.darwin-x86_64.txt
index e031d79036..e031d79036 100644
--- a/ydb/core/tablet_flat/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/ut/CMakeLists.linux.txt b/ydb/core/tablet_flat/ut/CMakeLists.linux-x86_64.txt
index 220ba4127c..220ba4127c 100644
--- a/ydb/core/tablet_flat/ut/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/ut/CMakeLists.txt b/ydb/core/tablet_flat/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/ut/CMakeLists.txt
+++ b/ydb/core/tablet_flat/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/ut_large/CMakeLists.darwin.txt b/ydb/core/tablet_flat/ut_large/CMakeLists.darwin-x86_64.txt
index 9f5d84e6e2..9f5d84e6e2 100644
--- a/ydb/core/tablet_flat/ut_large/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/ut_large/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/ut_large/CMakeLists.linux.txt b/ydb/core/tablet_flat/ut_large/CMakeLists.linux-x86_64.txt
index 4d176a32e7..4d176a32e7 100644
--- a/ydb/core/tablet_flat/ut_large/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/ut_large/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/ut_large/CMakeLists.txt b/ydb/core/tablet_flat/ut_large/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/ut_large/CMakeLists.txt
+++ b/ydb/core/tablet_flat/ut_large/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/ut_pg/CMakeLists.darwin.txt b/ydb/core/tablet_flat/ut_pg/CMakeLists.darwin-x86_64.txt
index ad203857d2..ad203857d2 100644
--- a/ydb/core/tablet_flat/ut_pg/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/ut_pg/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/ut_pg/CMakeLists.linux.txt b/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-x86_64.txt
index 937070c9ab..937070c9ab 100644
--- a/ydb/core/tablet_flat/ut_pg/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/ut_pg/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/ut_pg/CMakeLists.txt b/ydb/core/tablet_flat/ut_pg/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/ut_pg/CMakeLists.txt
+++ b/ydb/core/tablet_flat/ut_pg/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tablet_flat/ut_util/CMakeLists.darwin.txt b/ydb/core/tablet_flat/ut_util/CMakeLists.darwin-x86_64.txt
index e2643426c9..e2643426c9 100644
--- a/ydb/core/tablet_flat/ut_util/CMakeLists.darwin.txt
+++ b/ydb/core/tablet_flat/ut_util/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tablet_flat/ut_util/CMakeLists.linux.txt b/ydb/core/tablet_flat/ut_util/CMakeLists.linux-x86_64.txt
index 473fb6d133..473fb6d133 100644
--- a/ydb/core/tablet_flat/ut_util/CMakeLists.linux.txt
+++ b/ydb/core/tablet_flat/ut_util/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tablet_flat/ut_util/CMakeLists.txt b/ydb/core/tablet_flat/ut_util/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tablet_flat/ut_util/CMakeLists.txt
+++ b/ydb/core/tablet_flat/ut_util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/test_tablet/CMakeLists.darwin.txt b/ydb/core/test_tablet/CMakeLists.darwin-x86_64.txt
index 48dcfc154a..48dcfc154a 100644
--- a/ydb/core/test_tablet/CMakeLists.darwin.txt
+++ b/ydb/core/test_tablet/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/test_tablet/CMakeLists.linux.txt b/ydb/core/test_tablet/CMakeLists.linux-x86_64.txt
index 78de9acf4d..78de9acf4d 100644
--- a/ydb/core/test_tablet/CMakeLists.linux.txt
+++ b/ydb/core/test_tablet/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/test_tablet/CMakeLists.txt b/ydb/core/test_tablet/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/test_tablet/CMakeLists.txt
+++ b/ydb/core/test_tablet/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/testlib/CMakeLists.darwin.txt b/ydb/core/testlib/CMakeLists.darwin-x86_64.txt
index 699c067000..699c067000 100644
--- a/ydb/core/testlib/CMakeLists.darwin.txt
+++ b/ydb/core/testlib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/testlib/CMakeLists.linux.txt b/ydb/core/testlib/CMakeLists.linux-x86_64.txt
index 0439fe96da..0439fe96da 100644
--- a/ydb/core/testlib/CMakeLists.linux.txt
+++ b/ydb/core/testlib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/testlib/CMakeLists.txt b/ydb/core/testlib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/testlib/CMakeLists.txt
+++ b/ydb/core/testlib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/testlib/actors/CMakeLists.darwin.txt b/ydb/core/testlib/actors/CMakeLists.darwin-x86_64.txt
index ee3a1ec036..ee3a1ec036 100644
--- a/ydb/core/testlib/actors/CMakeLists.darwin.txt
+++ b/ydb/core/testlib/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/testlib/actors/CMakeLists.linux.txt b/ydb/core/testlib/actors/CMakeLists.linux-x86_64.txt
index 4e148b509e..4e148b509e 100644
--- a/ydb/core/testlib/actors/CMakeLists.linux.txt
+++ b/ydb/core/testlib/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/testlib/actors/CMakeLists.txt b/ydb/core/testlib/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/testlib/actors/CMakeLists.txt
+++ b/ydb/core/testlib/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/testlib/actors/ut/CMakeLists.darwin.txt b/ydb/core/testlib/actors/ut/CMakeLists.darwin-x86_64.txt
index 3e7c238866..3e7c238866 100644
--- a/ydb/core/testlib/actors/ut/CMakeLists.darwin.txt
+++ b/ydb/core/testlib/actors/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/testlib/actors/ut/CMakeLists.linux.txt b/ydb/core/testlib/actors/ut/CMakeLists.linux-x86_64.txt
index fd65a2af02..fd65a2af02 100644
--- a/ydb/core/testlib/actors/ut/CMakeLists.linux.txt
+++ b/ydb/core/testlib/actors/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/testlib/actors/ut/CMakeLists.txt b/ydb/core/testlib/actors/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/testlib/actors/ut/CMakeLists.txt
+++ b/ydb/core/testlib/actors/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/testlib/basics/CMakeLists.darwin.txt b/ydb/core/testlib/basics/CMakeLists.darwin-x86_64.txt
index 1f963b1883..1f963b1883 100644
--- a/ydb/core/testlib/basics/CMakeLists.darwin.txt
+++ b/ydb/core/testlib/basics/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/testlib/basics/CMakeLists.linux.txt b/ydb/core/testlib/basics/CMakeLists.linux-x86_64.txt
index ae8a039691..ae8a039691 100644
--- a/ydb/core/testlib/basics/CMakeLists.linux.txt
+++ b/ydb/core/testlib/basics/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/testlib/basics/CMakeLists.txt b/ydb/core/testlib/basics/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/testlib/basics/CMakeLists.txt
+++ b/ydb/core/testlib/basics/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/testlib/basics/default/CMakeLists.darwin.txt b/ydb/core/testlib/basics/default/CMakeLists.darwin-x86_64.txt
index f95ffc8013..f95ffc8013 100644
--- a/ydb/core/testlib/basics/default/CMakeLists.darwin.txt
+++ b/ydb/core/testlib/basics/default/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/testlib/basics/default/CMakeLists.linux.txt b/ydb/core/testlib/basics/default/CMakeLists.linux-x86_64.txt
index 06d27cdf77..06d27cdf77 100644
--- a/ydb/core/testlib/basics/default/CMakeLists.linux.txt
+++ b/ydb/core/testlib/basics/default/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/testlib/basics/default/CMakeLists.txt b/ydb/core/testlib/basics/default/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/testlib/basics/default/CMakeLists.txt
+++ b/ydb/core/testlib/basics/default/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/testlib/default/CMakeLists.darwin.txt b/ydb/core/testlib/default/CMakeLists.darwin-x86_64.txt
index 1897f36f9d..1897f36f9d 100644
--- a/ydb/core/testlib/default/CMakeLists.darwin.txt
+++ b/ydb/core/testlib/default/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/testlib/default/CMakeLists.linux.txt b/ydb/core/testlib/default/CMakeLists.linux-x86_64.txt
index a665c380d2..a665c380d2 100644
--- a/ydb/core/testlib/default/CMakeLists.linux.txt
+++ b/ydb/core/testlib/default/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/testlib/default/CMakeLists.txt b/ydb/core/testlib/default/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/testlib/default/CMakeLists.txt
+++ b/ydb/core/testlib/default/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/testlib/pg/CMakeLists.darwin.txt b/ydb/core/testlib/pg/CMakeLists.darwin-x86_64.txt
index 7d263fa4af..7d263fa4af 100644
--- a/ydb/core/testlib/pg/CMakeLists.darwin.txt
+++ b/ydb/core/testlib/pg/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/testlib/pg/CMakeLists.linux.txt b/ydb/core/testlib/pg/CMakeLists.linux-x86_64.txt
index 89512dce03..89512dce03 100644
--- a/ydb/core/testlib/pg/CMakeLists.linux.txt
+++ b/ydb/core/testlib/pg/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/testlib/pg/CMakeLists.txt b/ydb/core/testlib/pg/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/testlib/pg/CMakeLists.txt
+++ b/ydb/core/testlib/pg/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tracing/CMakeLists.darwin.txt b/ydb/core/tracing/CMakeLists.darwin-x86_64.txt
index 2ffc82165d..2ffc82165d 100644
--- a/ydb/core/tracing/CMakeLists.darwin.txt
+++ b/ydb/core/tracing/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tracing/CMakeLists.linux.txt b/ydb/core/tracing/CMakeLists.linux-x86_64.txt
index 7d8eb71fc9..7d8eb71fc9 100644
--- a/ydb/core/tracing/CMakeLists.linux.txt
+++ b/ydb/core/tracing/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tracing/CMakeLists.txt b/ydb/core/tracing/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tracing/CMakeLists.txt
+++ b/ydb/core/tracing/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/CMakeLists.darwin.txt b/ydb/core/tx/CMakeLists.darwin-x86_64.txt
index e4fe0eea1f..e4fe0eea1f 100644
--- a/ydb/core/tx/CMakeLists.darwin.txt
+++ b/ydb/core/tx/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/CMakeLists.linux.txt b/ydb/core/tx/CMakeLists.linux-x86_64.txt
index f2f8b8e3e5..f2f8b8e3e5 100644
--- a/ydb/core/tx/CMakeLists.linux.txt
+++ b/ydb/core/tx/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/CMakeLists.txt b/ydb/core/tx/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/CMakeLists.txt
+++ b/ydb/core/tx/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/balance_coverage/CMakeLists.darwin.txt b/ydb/core/tx/balance_coverage/CMakeLists.darwin-x86_64.txt
index 363e91a78a..363e91a78a 100644
--- a/ydb/core/tx/balance_coverage/CMakeLists.darwin.txt
+++ b/ydb/core/tx/balance_coverage/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/balance_coverage/CMakeLists.linux.txt b/ydb/core/tx/balance_coverage/CMakeLists.linux-x86_64.txt
index 596dc8126e..596dc8126e 100644
--- a/ydb/core/tx/balance_coverage/CMakeLists.linux.txt
+++ b/ydb/core/tx/balance_coverage/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/balance_coverage/CMakeLists.txt b/ydb/core/tx/balance_coverage/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/balance_coverage/CMakeLists.txt
+++ b/ydb/core/tx/balance_coverage/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/balance_coverage/ut/CMakeLists.darwin.txt b/ydb/core/tx/balance_coverage/ut/CMakeLists.darwin-x86_64.txt
index ccb9c560eb..ccb9c560eb 100644
--- a/ydb/core/tx/balance_coverage/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/balance_coverage/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/balance_coverage/ut/CMakeLists.linux.txt b/ydb/core/tx/balance_coverage/ut/CMakeLists.linux-x86_64.txt
index bad42d9c64..bad42d9c64 100644
--- a/ydb/core/tx/balance_coverage/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/balance_coverage/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/balance_coverage/ut/CMakeLists.txt b/ydb/core/tx/balance_coverage/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/balance_coverage/ut/CMakeLists.txt
+++ b/ydb/core/tx/balance_coverage/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/columnshard/CMakeLists.darwin.txt b/ydb/core/tx/columnshard/CMakeLists.darwin-x86_64.txt
index 04fc6c670b..04fc6c670b 100644
--- a/ydb/core/tx/columnshard/CMakeLists.darwin.txt
+++ b/ydb/core/tx/columnshard/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/columnshard/CMakeLists.linux.txt b/ydb/core/tx/columnshard/CMakeLists.linux-x86_64.txt
index 7d7683eed6..7d7683eed6 100644
--- a/ydb/core/tx/columnshard/CMakeLists.linux.txt
+++ b/ydb/core/tx/columnshard/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/columnshard/CMakeLists.txt b/ydb/core/tx/columnshard/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/columnshard/CMakeLists.txt
+++ b/ydb/core/tx/columnshard/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/columnshard/engines/CMakeLists.darwin.txt b/ydb/core/tx/columnshard/engines/CMakeLists.darwin-x86_64.txt
index 6e27fb3e51..6e27fb3e51 100644
--- a/ydb/core/tx/columnshard/engines/CMakeLists.darwin.txt
+++ b/ydb/core/tx/columnshard/engines/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/columnshard/engines/CMakeLists.linux.txt b/ydb/core/tx/columnshard/engines/CMakeLists.linux-x86_64.txt
index 10c6eaf1a0..10c6eaf1a0 100644
--- a/ydb/core/tx/columnshard/engines/CMakeLists.linux.txt
+++ b/ydb/core/tx/columnshard/engines/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/columnshard/engines/CMakeLists.txt b/ydb/core/tx/columnshard/engines/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/columnshard/engines/CMakeLists.txt
+++ b/ydb/core/tx/columnshard/engines/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/columnshard/engines/ut/CMakeLists.darwin.txt b/ydb/core/tx/columnshard/engines/ut/CMakeLists.darwin-x86_64.txt
index 9da7d84d1d..9da7d84d1d 100644
--- a/ydb/core/tx/columnshard/engines/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/columnshard/engines/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/columnshard/engines/ut/CMakeLists.linux.txt b/ydb/core/tx/columnshard/engines/ut/CMakeLists.linux-x86_64.txt
index 2c36d7d900..2c36d7d900 100644
--- a/ydb/core/tx/columnshard/engines/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/columnshard/engines/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/columnshard/engines/ut/CMakeLists.txt b/ydb/core/tx/columnshard/engines/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/columnshard/engines/ut/CMakeLists.txt
+++ b/ydb/core/tx/columnshard/engines/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/columnshard/ut_rw/CMakeLists.darwin.txt b/ydb/core/tx/columnshard/ut_rw/CMakeLists.darwin-x86_64.txt
index 1a9db7885f..1a9db7885f 100644
--- a/ydb/core/tx/columnshard/ut_rw/CMakeLists.darwin.txt
+++ b/ydb/core/tx/columnshard/ut_rw/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/columnshard/ut_rw/CMakeLists.linux.txt b/ydb/core/tx/columnshard/ut_rw/CMakeLists.linux-x86_64.txt
index 110434e2b4..110434e2b4 100644
--- a/ydb/core/tx/columnshard/ut_rw/CMakeLists.linux.txt
+++ b/ydb/core/tx/columnshard/ut_rw/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/columnshard/ut_rw/CMakeLists.txt b/ydb/core/tx/columnshard/ut_rw/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/columnshard/ut_rw/CMakeLists.txt
+++ b/ydb/core/tx/columnshard/ut_rw/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/columnshard/ut_schema/CMakeLists.darwin.txt b/ydb/core/tx/columnshard/ut_schema/CMakeLists.darwin-x86_64.txt
index 9bdf5c7f30..9bdf5c7f30 100644
--- a/ydb/core/tx/columnshard/ut_schema/CMakeLists.darwin.txt
+++ b/ydb/core/tx/columnshard/ut_schema/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/columnshard/ut_schema/CMakeLists.linux.txt b/ydb/core/tx/columnshard/ut_schema/CMakeLists.linux-x86_64.txt
index c1f8a300a4..c1f8a300a4 100644
--- a/ydb/core/tx/columnshard/ut_schema/CMakeLists.linux.txt
+++ b/ydb/core/tx/columnshard/ut_schema/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/columnshard/ut_schema/CMakeLists.txt b/ydb/core/tx/columnshard/ut_schema/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/columnshard/ut_schema/CMakeLists.txt
+++ b/ydb/core/tx/columnshard/ut_schema/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/coordinator/CMakeLists.darwin.txt b/ydb/core/tx/coordinator/CMakeLists.darwin-x86_64.txt
index ae71c871d6..ae71c871d6 100644
--- a/ydb/core/tx/coordinator/CMakeLists.darwin.txt
+++ b/ydb/core/tx/coordinator/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/coordinator/CMakeLists.linux.txt b/ydb/core/tx/coordinator/CMakeLists.linux-x86_64.txt
index cfc638e059..cfc638e059 100644
--- a/ydb/core/tx/coordinator/CMakeLists.linux.txt
+++ b/ydb/core/tx/coordinator/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/coordinator/CMakeLists.txt b/ydb/core/tx/coordinator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/coordinator/CMakeLists.txt
+++ b/ydb/core/tx/coordinator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/coordinator/ut/CMakeLists.darwin.txt b/ydb/core/tx/coordinator/ut/CMakeLists.darwin-x86_64.txt
index c29128f705..c29128f705 100644
--- a/ydb/core/tx/coordinator/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/coordinator/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/coordinator/ut/CMakeLists.linux.txt b/ydb/core/tx/coordinator/ut/CMakeLists.linux-x86_64.txt
index 13bdc592be..13bdc592be 100644
--- a/ydb/core/tx/coordinator/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/coordinator/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/coordinator/ut/CMakeLists.txt b/ydb/core/tx/coordinator/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/coordinator/ut/CMakeLists.txt
+++ b/ydb/core/tx/coordinator/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/CMakeLists.darwin.txt b/ydb/core/tx/datashard/CMakeLists.darwin-x86_64.txt
index 36883adf5d..36883adf5d 100644
--- a/ydb/core/tx/datashard/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/CMakeLists.linux.txt b/ydb/core/tx/datashard/CMakeLists.linux-x86_64.txt
index 5a350e0524..5a350e0524 100644
--- a/ydb/core/tx/datashard/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/CMakeLists.txt b/ydb/core/tx/datashard/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/CMakeLists.txt
+++ b/ydb/core/tx/datashard/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.darwin-x86_64.txt
index 0beae4bc4a..0beae4bc4a 100644
--- a/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.linux-x86_64.txt
index 2197176661..2197176661 100644
--- a/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.txt b/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_build_index/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_build_index/CMakeLists.darwin-x86_64.txt
index 1480123733..1480123733 100644
--- a/ydb/core/tx/datashard/ut_build_index/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_build_index/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_build_index/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_build_index/CMakeLists.linux-x86_64.txt
index 72c6558315..72c6558315 100644
--- a/ydb/core/tx/datashard/ut_build_index/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_build_index/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_build_index/CMakeLists.txt b/ydb/core/tx/datashard/ut_build_index/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_build_index/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_build_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_change_collector/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_change_collector/CMakeLists.darwin-x86_64.txt
index f910773453..f910773453 100644
--- a/ydb/core/tx/datashard/ut_change_collector/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_change_collector/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_change_collector/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_change_collector/CMakeLists.linux-x86_64.txt
index e48fbd3379..e48fbd3379 100644
--- a/ydb/core/tx/datashard/ut_change_collector/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_change_collector/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_change_collector/CMakeLists.txt b/ydb/core/tx/datashard/ut_change_collector/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_change_collector/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_change_collector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.darwin-x86_64.txt
index 06ab9bed31..06ab9bed31 100644
--- a/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.linux-x86_64.txt
index 4510bdcdcf..4510bdcdcf 100644
--- a/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.txt b/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_compaction/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_compaction/CMakeLists.darwin-x86_64.txt
index cba9d77aef..cba9d77aef 100644
--- a/ydb/core/tx/datashard/ut_compaction/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_compaction/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_compaction/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_compaction/CMakeLists.linux-x86_64.txt
index 8b6b4e286a..8b6b4e286a 100644
--- a/ydb/core/tx/datashard/ut_compaction/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_compaction/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_compaction/CMakeLists.txt b/ydb/core/tx/datashard/ut_compaction/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_compaction/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_compaction/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.darwin-x86_64.txt
index 3c32067dee..3c32067dee 100644
--- a/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.linux-x86_64.txt
index d7c5719cf1..d7c5719cf1 100644
--- a/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.txt b/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_followers/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_followers/CMakeLists.darwin-x86_64.txt
index 5515e2abc2..5515e2abc2 100644
--- a/ydb/core/tx/datashard/ut_followers/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_followers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_followers/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_followers/CMakeLists.linux-x86_64.txt
index ab44a00e8d..ab44a00e8d 100644
--- a/ydb/core/tx/datashard/ut_followers/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_followers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_followers/CMakeLists.txt b/ydb/core/tx/datashard/ut_followers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_followers/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_followers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_init/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_init/CMakeLists.darwin-x86_64.txt
index 5206231ce5..5206231ce5 100644
--- a/ydb/core/tx/datashard/ut_init/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_init/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_init/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_init/CMakeLists.linux-x86_64.txt
index e2c7e11c14..e2c7e11c14 100644
--- a/ydb/core/tx/datashard/ut_init/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_init/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_init/CMakeLists.txt b/ydb/core/tx/datashard/ut_init/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_init/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_init/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_keys/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_keys/CMakeLists.darwin-x86_64.txt
index 9f02a9987c..9f02a9987c 100644
--- a/ydb/core/tx/datashard/ut_keys/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_keys/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_keys/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_keys/CMakeLists.linux-x86_64.txt
index 9015216256..9015216256 100644
--- a/ydb/core/tx/datashard/ut_keys/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_keys/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_keys/CMakeLists.txt b/ydb/core/tx/datashard/ut_keys/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_keys/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_keys/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_kqp/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_kqp/CMakeLists.darwin-x86_64.txt
index 60015599ab..60015599ab 100644
--- a/ydb/core/tx/datashard/ut_kqp/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_kqp/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_kqp/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_kqp/CMakeLists.linux-x86_64.txt
index a1e308e3a1..a1e308e3a1 100644
--- a/ydb/core/tx/datashard/ut_kqp/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_kqp/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_kqp/CMakeLists.txt b/ydb/core/tx/datashard/ut_kqp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_kqp/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_kqp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.darwin-x86_64.txt
index 1f35b481cd..1f35b481cd 100644
--- a/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.linux-x86_64.txt
index 6de65883af..6de65883af 100644
--- a/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.txt b/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.darwin-x86_64.txt
index 9e385e935b..9e385e935b 100644
--- a/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.linux-x86_64.txt
index 65a4454195..65a4454195 100644
--- a/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.txt b/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_locks/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_locks/CMakeLists.darwin-x86_64.txt
index a249a6e1a1..a249a6e1a1 100644
--- a/ydb/core/tx/datashard/ut_locks/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_locks/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_locks/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_locks/CMakeLists.linux-x86_64.txt
index 037966adbf..037966adbf 100644
--- a/ydb/core/tx/datashard/ut_locks/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_locks/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_locks/CMakeLists.txt b/ydb/core/tx/datashard/ut_locks/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_locks/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_locks/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_minikql/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_minikql/CMakeLists.darwin-x86_64.txt
index 48d7876096..48d7876096 100644
--- a/ydb/core/tx/datashard/ut_minikql/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_minikql/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_minikql/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_minikql/CMakeLists.linux-x86_64.txt
index 883aa606d6..883aa606d6 100644
--- a/ydb/core/tx/datashard/ut_minikql/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_minikql/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_minikql/CMakeLists.txt b/ydb/core/tx/datashard/ut_minikql/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_minikql/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_minikql/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_minstep/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_minstep/CMakeLists.darwin-x86_64.txt
index b666858b1e..b666858b1e 100644
--- a/ydb/core/tx/datashard/ut_minstep/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_minstep/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_minstep/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_minstep/CMakeLists.linux-x86_64.txt
index 76424f36c0..76424f36c0 100644
--- a/ydb/core/tx/datashard/ut_minstep/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_minstep/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_minstep/CMakeLists.txt b/ydb/core/tx/datashard/ut_minstep/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_minstep/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_minstep/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_order/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_order/CMakeLists.darwin-x86_64.txt
index 8ef7ce0d10..8ef7ce0d10 100644
--- a/ydb/core/tx/datashard/ut_order/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_order/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_order/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_order/CMakeLists.linux-x86_64.txt
index e2eed68752..e2eed68752 100644
--- a/ydb/core/tx/datashard/ut_order/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_order/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_order/CMakeLists.txt b/ydb/core/tx/datashard/ut_order/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_order/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_order/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.darwin-x86_64.txt
index 0543dab784..0543dab784 100644
--- a/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.linux-x86_64.txt
index 54cfa116ae..54cfa116ae 100644
--- a/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.txt b/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_range_ops/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_range_ops/CMakeLists.darwin-x86_64.txt
index f33766f529..f33766f529 100644
--- a/ydb/core/tx/datashard/ut_range_ops/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_range_ops/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_range_ops/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_range_ops/CMakeLists.linux-x86_64.txt
index 84eec83762..84eec83762 100644
--- a/ydb/core/tx/datashard/ut_range_ops/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_range_ops/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_range_ops/CMakeLists.txt b/ydb/core/tx/datashard/ut_range_ops/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_range_ops/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_range_ops/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_range_treap/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_range_treap/CMakeLists.darwin-x86_64.txt
index 68a3030fb1..68a3030fb1 100644
--- a/ydb/core/tx/datashard/ut_range_treap/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_range_treap/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_range_treap/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_range_treap/CMakeLists.linux-x86_64.txt
index 8ef94e6fee..8ef94e6fee 100644
--- a/ydb/core/tx/datashard/ut_range_treap/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_range_treap/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_range_treap/CMakeLists.txt b/ydb/core/tx/datashard/ut_range_treap/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_range_treap/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_range_treap/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.darwin-x86_64.txt
index a4432cdd5b..a4432cdd5b 100644
--- a/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.linux-x86_64.txt
index eb8a288525..eb8a288525 100644
--- a/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.txt b/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_read_table/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_read_table/CMakeLists.darwin-x86_64.txt
index f4918062cb..f4918062cb 100644
--- a/ydb/core/tx/datashard/ut_read_table/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_read_table/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_read_table/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_read_table/CMakeLists.linux-x86_64.txt
index 8ad350a273..8ad350a273 100644
--- a/ydb/core/tx/datashard/ut_read_table/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_read_table/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_read_table/CMakeLists.txt b/ydb/core/tx/datashard/ut_read_table/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_read_table/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_read_table/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_reassign/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_reassign/CMakeLists.darwin-x86_64.txt
index 3dfe18a549..3dfe18a549 100644
--- a/ydb/core/tx/datashard/ut_reassign/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_reassign/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_reassign/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_reassign/CMakeLists.linux-x86_64.txt
index 37d9f551c4..37d9f551c4 100644
--- a/ydb/core/tx/datashard/ut_reassign/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_reassign/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_reassign/CMakeLists.txt b/ydb/core/tx/datashard/ut_reassign/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_reassign/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_reassign/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_replication/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_replication/CMakeLists.darwin-x86_64.txt
index d941f65f17..d941f65f17 100644
--- a/ydb/core/tx/datashard/ut_replication/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_replication/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_replication/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_replication/CMakeLists.linux-x86_64.txt
index 78dacb8d18..78dacb8d18 100644
--- a/ydb/core/tx/datashard/ut_replication/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_replication/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_replication/CMakeLists.txt b/ydb/core/tx/datashard/ut_replication/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_replication/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_replication/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_rs/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_rs/CMakeLists.darwin-x86_64.txt
index 4de5e571ca..4de5e571ca 100644
--- a/ydb/core/tx/datashard/ut_rs/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_rs/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_rs/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_rs/CMakeLists.linux-x86_64.txt
index 5c7d360e32..5c7d360e32 100644
--- a/ydb/core/tx/datashard/ut_rs/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_rs/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_rs/CMakeLists.txt b/ydb/core/tx/datashard/ut_rs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_rs/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_rs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_snapshot/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_snapshot/CMakeLists.darwin-x86_64.txt
index 174cf61a84..174cf61a84 100644
--- a/ydb/core/tx/datashard/ut_snapshot/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_snapshot/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_snapshot/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_snapshot/CMakeLists.linux-x86_64.txt
index 7dafe42f3e..7dafe42f3e 100644
--- a/ydb/core/tx/datashard/ut_snapshot/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_snapshot/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_snapshot/CMakeLists.txt b/ydb/core/tx/datashard/ut_snapshot/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_snapshot/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_snapshot/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_stats/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_stats/CMakeLists.darwin-x86_64.txt
index cdf8c8287a..cdf8c8287a 100644
--- a/ydb/core/tx/datashard/ut_stats/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_stats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_stats/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_stats/CMakeLists.linux-x86_64.txt
index 6388557e97..6388557e97 100644
--- a/ydb/core/tx/datashard/ut_stats/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_stats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_stats/CMakeLists.txt b/ydb/core/tx/datashard/ut_stats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_stats/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_stats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.darwin-x86_64.txt
index a68ac6e3dd..a68ac6e3dd 100644
--- a/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.linux-x86_64.txt
index b0ec132d0b..b0ec132d0b 100644
--- a/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.txt b/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/datashard/ut_volatile/CMakeLists.darwin.txt b/ydb/core/tx/datashard/ut_volatile/CMakeLists.darwin-x86_64.txt
index fe923f8e30..fe923f8e30 100644
--- a/ydb/core/tx/datashard/ut_volatile/CMakeLists.darwin.txt
+++ b/ydb/core/tx/datashard/ut_volatile/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_volatile/CMakeLists.linux.txt b/ydb/core/tx/datashard/ut_volatile/CMakeLists.linux-x86_64.txt
index ee4faf0ef5..ee4faf0ef5 100644
--- a/ydb/core/tx/datashard/ut_volatile/CMakeLists.linux.txt
+++ b/ydb/core/tx/datashard/ut_volatile/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/datashard/ut_volatile/CMakeLists.txt b/ydb/core/tx/datashard/ut_volatile/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/datashard/ut_volatile/CMakeLists.txt
+++ b/ydb/core/tx/datashard/ut_volatile/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/long_tx_service/CMakeLists.darwin.txt b/ydb/core/tx/long_tx_service/CMakeLists.darwin-x86_64.txt
index c29cdc8938..c29cdc8938 100644
--- a/ydb/core/tx/long_tx_service/CMakeLists.darwin.txt
+++ b/ydb/core/tx/long_tx_service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/long_tx_service/CMakeLists.linux.txt b/ydb/core/tx/long_tx_service/CMakeLists.linux-x86_64.txt
index 9e74c57c6f..9e74c57c6f 100644
--- a/ydb/core/tx/long_tx_service/CMakeLists.linux.txt
+++ b/ydb/core/tx/long_tx_service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/long_tx_service/CMakeLists.txt b/ydb/core/tx/long_tx_service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/long_tx_service/CMakeLists.txt
+++ b/ydb/core/tx/long_tx_service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/long_tx_service/public/CMakeLists.darwin.txt b/ydb/core/tx/long_tx_service/public/CMakeLists.darwin-x86_64.txt
index 81f9839443..81f9839443 100644
--- a/ydb/core/tx/long_tx_service/public/CMakeLists.darwin.txt
+++ b/ydb/core/tx/long_tx_service/public/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/long_tx_service/public/CMakeLists.linux.txt b/ydb/core/tx/long_tx_service/public/CMakeLists.linux-x86_64.txt
index 40b13ea0e1..40b13ea0e1 100644
--- a/ydb/core/tx/long_tx_service/public/CMakeLists.linux.txt
+++ b/ydb/core/tx/long_tx_service/public/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/long_tx_service/public/CMakeLists.txt b/ydb/core/tx/long_tx_service/public/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/long_tx_service/public/CMakeLists.txt
+++ b/ydb/core/tx/long_tx_service/public/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/long_tx_service/public/ut/CMakeLists.darwin.txt b/ydb/core/tx/long_tx_service/public/ut/CMakeLists.darwin-x86_64.txt
index 7aa8d4abc8..7aa8d4abc8 100644
--- a/ydb/core/tx/long_tx_service/public/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/long_tx_service/public/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/long_tx_service/public/ut/CMakeLists.linux.txt b/ydb/core/tx/long_tx_service/public/ut/CMakeLists.linux-x86_64.txt
index 7695e71e3a..7695e71e3a 100644
--- a/ydb/core/tx/long_tx_service/public/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/long_tx_service/public/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/long_tx_service/public/ut/CMakeLists.txt b/ydb/core/tx/long_tx_service/public/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/long_tx_service/public/ut/CMakeLists.txt
+++ b/ydb/core/tx/long_tx_service/public/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/long_tx_service/ut/CMakeLists.darwin.txt b/ydb/core/tx/long_tx_service/ut/CMakeLists.darwin-x86_64.txt
index e3570a755c..e3570a755c 100644
--- a/ydb/core/tx/long_tx_service/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/long_tx_service/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/long_tx_service/ut/CMakeLists.linux.txt b/ydb/core/tx/long_tx_service/ut/CMakeLists.linux-x86_64.txt
index 1b759f0385..1b759f0385 100644
--- a/ydb/core/tx/long_tx_service/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/long_tx_service/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/long_tx_service/ut/CMakeLists.txt b/ydb/core/tx/long_tx_service/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/long_tx_service/ut/CMakeLists.txt
+++ b/ydb/core/tx/long_tx_service/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/mediator/CMakeLists.darwin.txt b/ydb/core/tx/mediator/CMakeLists.darwin-x86_64.txt
index e510cdc9d5..e510cdc9d5 100644
--- a/ydb/core/tx/mediator/CMakeLists.darwin.txt
+++ b/ydb/core/tx/mediator/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/mediator/CMakeLists.linux.txt b/ydb/core/tx/mediator/CMakeLists.linux-x86_64.txt
index 7a798aeff2..7a798aeff2 100644
--- a/ydb/core/tx/mediator/CMakeLists.linux.txt
+++ b/ydb/core/tx/mediator/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/mediator/CMakeLists.txt b/ydb/core/tx/mediator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/mediator/CMakeLists.txt
+++ b/ydb/core/tx/mediator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/replication/controller/CMakeLists.darwin.txt b/ydb/core/tx/replication/controller/CMakeLists.darwin-x86_64.txt
index 1c6c5087ce..1c6c5087ce 100644
--- a/ydb/core/tx/replication/controller/CMakeLists.darwin.txt
+++ b/ydb/core/tx/replication/controller/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/replication/controller/CMakeLists.linux.txt b/ydb/core/tx/replication/controller/CMakeLists.linux-x86_64.txt
index 725ca9d89f..725ca9d89f 100644
--- a/ydb/core/tx/replication/controller/CMakeLists.linux.txt
+++ b/ydb/core/tx/replication/controller/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/replication/controller/CMakeLists.txt b/ydb/core/tx/replication/controller/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/replication/controller/CMakeLists.txt
+++ b/ydb/core/tx/replication/controller/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/replication/service/CMakeLists.darwin.txt b/ydb/core/tx/replication/service/CMakeLists.darwin-x86_64.txt
index ce070b006e..ce070b006e 100644
--- a/ydb/core/tx/replication/service/CMakeLists.darwin.txt
+++ b/ydb/core/tx/replication/service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/replication/service/CMakeLists.linux.txt b/ydb/core/tx/replication/service/CMakeLists.linux-x86_64.txt
index 68c0eddf13..68c0eddf13 100644
--- a/ydb/core/tx/replication/service/CMakeLists.linux.txt
+++ b/ydb/core/tx/replication/service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/replication/service/CMakeLists.txt b/ydb/core/tx/replication/service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/replication/service/CMakeLists.txt
+++ b/ydb/core/tx/replication/service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/replication/ydb_proxy/CMakeLists.darwin.txt b/ydb/core/tx/replication/ydb_proxy/CMakeLists.darwin-x86_64.txt
index f5289141cd..f5289141cd 100644
--- a/ydb/core/tx/replication/ydb_proxy/CMakeLists.darwin.txt
+++ b/ydb/core/tx/replication/ydb_proxy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/replication/ydb_proxy/CMakeLists.linux.txt b/ydb/core/tx/replication/ydb_proxy/CMakeLists.linux-x86_64.txt
index dd04a0b7fe..dd04a0b7fe 100644
--- a/ydb/core/tx/replication/ydb_proxy/CMakeLists.linux.txt
+++ b/ydb/core/tx/replication/ydb_proxy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/replication/ydb_proxy/CMakeLists.txt b/ydb/core/tx/replication/ydb_proxy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/replication/ydb_proxy/CMakeLists.txt
+++ b/ydb/core/tx/replication/ydb_proxy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.darwin.txt b/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.darwin-x86_64.txt
index c9503b232a..c9503b232a 100644
--- a/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.linux.txt b/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.linux-x86_64.txt
index 61f6cd7a7d..61f6cd7a7d 100644
--- a/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.txt b/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.txt
+++ b/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/scheme_board/CMakeLists.darwin.txt b/ydb/core/tx/scheme_board/CMakeLists.darwin-x86_64.txt
index 5d8a3274fb..5d8a3274fb 100644
--- a/ydb/core/tx/scheme_board/CMakeLists.darwin.txt
+++ b/ydb/core/tx/scheme_board/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/CMakeLists.linux.txt b/ydb/core/tx/scheme_board/CMakeLists.linux-x86_64.txt
index 671448c5c8..671448c5c8 100644
--- a/ydb/core/tx/scheme_board/CMakeLists.linux.txt
+++ b/ydb/core/tx/scheme_board/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/CMakeLists.txt b/ydb/core/tx/scheme_board/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/scheme_board/CMakeLists.txt
+++ b/ydb/core/tx/scheme_board/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/scheme_board/ut_cache/CMakeLists.darwin.txt b/ydb/core/tx/scheme_board/ut_cache/CMakeLists.darwin-x86_64.txt
index e462538e71..e462538e71 100644
--- a/ydb/core/tx/scheme_board/ut_cache/CMakeLists.darwin.txt
+++ b/ydb/core/tx/scheme_board/ut_cache/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_cache/CMakeLists.linux.txt b/ydb/core/tx/scheme_board/ut_cache/CMakeLists.linux-x86_64.txt
index 1468786d3d..1468786d3d 100644
--- a/ydb/core/tx/scheme_board/ut_cache/CMakeLists.linux.txt
+++ b/ydb/core/tx/scheme_board/ut_cache/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_cache/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_cache/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/scheme_board/ut_cache/CMakeLists.txt
+++ b/ydb/core/tx/scheme_board/ut_cache/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.darwin.txt b/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.darwin-x86_64.txt
index 59a6a3b94b..59a6a3b94b 100644
--- a/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.darwin.txt
+++ b/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.linux.txt b/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.linux-x86_64.txt
index 00a580e969..00a580e969 100644
--- a/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.linux.txt
+++ b/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.txt
+++ b/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.darwin.txt b/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.darwin-x86_64.txt
index 6e8b3472a3..6e8b3472a3 100644
--- a/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.darwin.txt
+++ b/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.linux.txt b/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.linux-x86_64.txt
index 22808375ff..22808375ff 100644
--- a/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.linux.txt
+++ b/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.txt
+++ b/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/scheme_board/ut_populator/CMakeLists.darwin.txt b/ydb/core/tx/scheme_board/ut_populator/CMakeLists.darwin-x86_64.txt
index 1bf74cbc7d..1bf74cbc7d 100644
--- a/ydb/core/tx/scheme_board/ut_populator/CMakeLists.darwin.txt
+++ b/ydb/core/tx/scheme_board/ut_populator/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_populator/CMakeLists.linux.txt b/ydb/core/tx/scheme_board/ut_populator/CMakeLists.linux-x86_64.txt
index 255292a985..255292a985 100644
--- a/ydb/core/tx/scheme_board/ut_populator/CMakeLists.linux.txt
+++ b/ydb/core/tx/scheme_board/ut_populator/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_populator/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_populator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/scheme_board/ut_populator/CMakeLists.txt
+++ b/ydb/core/tx/scheme_board/ut_populator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/scheme_board/ut_replica/CMakeLists.darwin.txt b/ydb/core/tx/scheme_board/ut_replica/CMakeLists.darwin-x86_64.txt
index fb7c7ea605..fb7c7ea605 100644
--- a/ydb/core/tx/scheme_board/ut_replica/CMakeLists.darwin.txt
+++ b/ydb/core/tx/scheme_board/ut_replica/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_replica/CMakeLists.linux.txt b/ydb/core/tx/scheme_board/ut_replica/CMakeLists.linux-x86_64.txt
index bc81525443..bc81525443 100644
--- a/ydb/core/tx/scheme_board/ut_replica/CMakeLists.linux.txt
+++ b/ydb/core/tx/scheme_board/ut_replica/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_replica/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_replica/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/scheme_board/ut_replica/CMakeLists.txt
+++ b/ydb/core/tx/scheme_board/ut_replica/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.darwin.txt b/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.darwin-x86_64.txt
index e100476698..e100476698 100644
--- a/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.darwin.txt
+++ b/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.linux.txt b/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.linux-x86_64.txt
index 8c9410212b..8c9410212b 100644
--- a/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.linux.txt
+++ b/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.txt
+++ b/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/scheme_cache/CMakeLists.darwin.txt b/ydb/core/tx/scheme_cache/CMakeLists.darwin-x86_64.txt
index d4e1825e47..d4e1825e47 100644
--- a/ydb/core/tx/scheme_cache/CMakeLists.darwin.txt
+++ b/ydb/core/tx/scheme_cache/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/scheme_cache/CMakeLists.linux.txt b/ydb/core/tx/scheme_cache/CMakeLists.linux-x86_64.txt
index b9224ec077..b9224ec077 100644
--- a/ydb/core/tx/scheme_cache/CMakeLists.linux.txt
+++ b/ydb/core/tx/scheme_cache/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/scheme_cache/CMakeLists.txt b/ydb/core/tx/scheme_cache/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/scheme_cache/CMakeLists.txt
+++ b/ydb/core/tx/scheme_cache/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/CMakeLists.darwin-x86_64.txt
index a949324968..a949324968 100644
--- a/ydb/core/tx/schemeshard/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/CMakeLists.linux-x86_64.txt
index 644a5c51b9..644a5c51b9 100644
--- a/ydb/core/tx/schemeshard/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/CMakeLists.txt b/ydb/core/tx/schemeshard/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.darwin-x86_64.txt
index c27e72485b..c27e72485b 100644
--- a/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.linux-x86_64.txt
index 061fe31468..061fe31468 100644
--- a/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_backup/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_backup/CMakeLists.darwin-x86_64.txt
index 0f0c9ec68f..0f0c9ec68f 100644
--- a/ydb/core/tx/schemeshard/ut_backup/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_backup/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_backup/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_backup/CMakeLists.linux-x86_64.txt
index 0582ccf287..0582ccf287 100644
--- a/ydb/core/tx/schemeshard/ut_backup/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_backup/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_backup/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_backup/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_backup/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_backup/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_base/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_base/CMakeLists.darwin-x86_64.txt
index c672a9e87c..c672a9e87c 100644
--- a/ydb/core/tx/schemeshard/ut_base/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_base/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_base/CMakeLists.linux-x86_64.txt
index 51903bcbe5..51903bcbe5 100644
--- a/ydb/core/tx/schemeshard/ut_base/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_base/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_base/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.darwin-x86_64.txt
index 55c9b505eb..55c9b505eb 100644
--- a/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.linux-x86_64.txt
index 0564bb23cc..0564bb23cc 100644
--- a/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.darwin-x86_64.txt
index 4ddc9ac58f..4ddc9ac58f 100644
--- a/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.linux-x86_64.txt
index 480a565192..480a565192 100644
--- a/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.darwin-x86_64.txt
index b758a7a6e3..b758a7a6e3 100644
--- a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.linux-x86_64.txt
index c0b8db568a..c0b8db568a 100644
--- a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.darwin-x86_64.txt
index ce51eb2c1b..ce51eb2c1b 100644
--- a/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.linux-x86_64.txt
index ea3dc40c0d..ea3dc40c0d 100644
--- a/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.darwin-x86_64.txt
index dec2ad94f3..dec2ad94f3 100644
--- a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.linux-x86_64.txt
index ed50558bd2..ed50558bd2 100644
--- a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.darwin-x86_64.txt
index 0ecdac56a6..0ecdac56a6 100644
--- a/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.linux-x86_64.txt
index c2ab77d461..c2ab77d461 100644
--- a/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_export/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_export/CMakeLists.darwin-x86_64.txt
index 5163645d31..5163645d31 100644
--- a/ydb/core/tx/schemeshard/ut_export/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_export/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_export/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_export/CMakeLists.linux-x86_64.txt
index 8ebe946b96..8ebe946b96 100644
--- a/ydb/core/tx/schemeshard/ut_export/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_export/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_export/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_export/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_export/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_export/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.darwin-x86_64.txt
index 57869046b7..57869046b7 100644
--- a/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.linux-x86_64.txt
index 09a302c238..09a302c238 100644
--- a/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.darwin-x86_64.txt
index 913190e3ef..913190e3ef 100644
--- a/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.linux-x86_64.txt
index 037aa8a2ce..037aa8a2ce 100644
--- a/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_external_data_source/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.darwin-x86_64.txt
index 04409453c5..04409453c5 100644
--- a/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.linux-x86_64.txt
index 973e1a080e..973e1a080e 100644
--- a/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_external_data_source_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.darwin-x86_64.txt
index bc9fe0bca4..bc9fe0bca4 100644
--- a/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.linux-x86_64.txt
index f1418da3f2..f1418da3f2 100644
--- a/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_external_table/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.darwin-x86_64.txt
index 4a55f11b0a..4a55f11b0a 100644
--- a/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.linux-x86_64.txt
index 50b7782671..50b7782671 100644
--- a/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_external_table_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.darwin-x86_64.txt
index c56fd192cd..c56fd192cd 100644
--- a/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.linux-x86_64.txt
index c2d783a8ee..c2d783a8ee 100644
--- a/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.darwin-x86_64.txt
index 9d401e39f3..9d401e39f3 100644
--- a/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.linux-x86_64.txt
index a671ffdd11..a671ffdd11 100644
--- a/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.darwin-x86_64.txt
index 30fe0ce884..30fe0ce884 100644
--- a/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.linux-x86_64.txt
index 393bb0ddb9..393bb0ddb9 100644
--- a/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.darwin-x86_64.txt
index ff67c37abd..ff67c37abd 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.linux-x86_64.txt
index 2c4e9247b6..2c4e9247b6 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.darwin-x86_64.txt
index 0efbff16c9..0efbff16c9 100644
--- a/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.linux-x86_64.txt
index 26d7b26008..26d7b26008 100644
--- a/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.darwin-x86_64.txt
index 4df1c53193..4df1c53193 100644
--- a/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.linux-x86_64.txt
index 202d2b6c93..202d2b6c93 100644
--- a/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_login/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_login/CMakeLists.darwin-x86_64.txt
index 3f598041a6..3f598041a6 100644
--- a/ydb/core/tx/schemeshard/ut_login/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_login/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_login/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_login/CMakeLists.linux-x86_64.txt
index 84bc58ac86..84bc58ac86 100644
--- a/ydb/core/tx/schemeshard/ut_login/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_login/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_login/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_login/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_login/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_login/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_move/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_move/CMakeLists.darwin-x86_64.txt
index dfdd290a09..dfdd290a09 100644
--- a/ydb/core/tx/schemeshard/ut_move/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_move/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_move/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_move/CMakeLists.linux-x86_64.txt
index 2371b7f1d3..2371b7f1d3 100644
--- a/ydb/core/tx/schemeshard/ut_move/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_move/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_move/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_move/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_move/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_move/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.darwin-x86_64.txt
index d72b444cdd..d72b444cdd 100644
--- a/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.linux-x86_64.txt
index 6591381bcb..6591381bcb 100644
--- a/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_olap/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_olap/CMakeLists.darwin-x86_64.txt
index 690647f665..690647f665 100644
--- a/ydb/core/tx/schemeshard/ut_olap/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_olap/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_olap/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_olap/CMakeLists.linux-x86_64.txt
index 8fa94bcebb..8fa94bcebb 100644
--- a/ydb/core/tx/schemeshard/ut_olap/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_olap/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_olap/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_olap/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_olap/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_olap/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.darwin-x86_64.txt
index b724307bff..b724307bff 100644
--- a/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.linux-x86_64.txt
index 8220e543f6..8220e543f6 100644
--- a/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_pq/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_pq/CMakeLists.darwin-x86_64.txt
index 77cfa93d6f..77cfa93d6f 100644
--- a/ydb/core/tx/schemeshard/ut_pq/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_pq/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_pq/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_pq/CMakeLists.linux-x86_64.txt
index a788ff2f99..a788ff2f99 100644
--- a/ydb/core/tx/schemeshard/ut_pq/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_pq/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_pq/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_pq/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_pq/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_pq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.darwin-x86_64.txt
index 78cad4b690..78cad4b690 100644
--- a/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.linux-x86_64.txt
index 19be752550..19be752550 100644
--- a/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.darwin-x86_64.txt
index d31762800f..d31762800f 100644
--- a/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.linux-x86_64.txt
index acb70da0f4..acb70da0f4 100644
--- a/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_replication/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_replication/CMakeLists.darwin-x86_64.txt
index 3eb359e692..3eb359e692 100644
--- a/ydb/core/tx/schemeshard/ut_replication/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_replication/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_replication/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_replication/CMakeLists.linux-x86_64.txt
index f9d6c74b9a..f9d6c74b9a 100644
--- a/ydb/core/tx/schemeshard/ut_replication/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_replication/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_replication/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_replication/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_replication/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_replication/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.darwin-x86_64.txt
index b13cb101d4..b13cb101d4 100644
--- a/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.linux-x86_64.txt
index 9c637946ec..9c637946ec 100644
--- a/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_restore/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_restore/CMakeLists.darwin-x86_64.txt
index 033a1d6303..033a1d6303 100644
--- a/ydb/core/tx/schemeshard/ut_restore/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_restore/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_restore/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_restore/CMakeLists.linux-x86_64.txt
index 6b17ab0e24..6b17ab0e24 100644
--- a/ydb/core/tx/schemeshard/ut_restore/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_restore/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_restore/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_restore/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_restore/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_restore/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.darwin-x86_64.txt
index 8a57719e4b..8a57719e4b 100644
--- a/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.linux-x86_64.txt
index 8069853699..8069853699 100644
--- a/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.darwin-x86_64.txt
index 4cb4c06866..4cb4c06866 100644
--- a/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.linux-x86_64.txt
index baf76b49ae..baf76b49ae 100644
--- a/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.darwin-x86_64.txt
index a9edd1c8cb..a9edd1c8cb 100644
--- a/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.linux-x86_64.txt
index b237839e41..b237839e41 100644
--- a/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.darwin-x86_64.txt
index 7c5ffd8443..7c5ffd8443 100644
--- a/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.linux-x86_64.txt
index daaee6f8eb..daaee6f8eb 100644
--- a/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.darwin-x86_64.txt
index 47b29de899..47b29de899 100644
--- a/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.linux-x86_64.txt
index a72086470b..a72086470b 100644
--- a/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.darwin-x86_64.txt
index 83e00005d9..83e00005d9 100644
--- a/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.linux-x86_64.txt
index 98d46fa558..98d46fa558 100644
--- a/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.darwin-x86_64.txt
index 12af9831d3..12af9831d3 100644
--- a/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.linux-x86_64.txt
index 4a41f6fbd7..4a41f6fbd7 100644
--- a/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.darwin-x86_64.txt
index 6ba6b1950c..6ba6b1950c 100644
--- a/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.linux-x86_64.txt
index 4051792643..4051792643 100644
--- a/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_stats/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_stats/CMakeLists.darwin-x86_64.txt
index ab954781bb..ab954781bb 100644
--- a/ydb/core/tx/schemeshard/ut_stats/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_stats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_stats/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_stats/CMakeLists.linux-x86_64.txt
index 4d6f5b7d99..4d6f5b7d99 100644
--- a/ydb/core/tx/schemeshard/ut_stats/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_stats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_stats/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_stats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_stats/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_stats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.darwin-x86_64.txt
index b2643e5ddb..b2643e5ddb 100644
--- a/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.linux-x86_64.txt
index 38ed49a130..38ed49a130 100644
--- a/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.darwin-x86_64.txt
index 72b423bf04..72b423bf04 100644
--- a/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.linux-x86_64.txt
index 93674c94e2..93674c94e2 100644
--- a/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.darwin-x86_64.txt
index 5e44489411..5e44489411 100644
--- a/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.linux-x86_64.txt
index f9cc3fc622..f9cc3fc622 100644
--- a/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.darwin-x86_64.txt
index f98c503992..f98c503992 100644
--- a/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.linux-x86_64.txt
index 6f22c933f4..6f22c933f4 100644
--- a/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.darwin.txt b/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.darwin-x86_64.txt
index d7b029f417..d7b029f417 100644
--- a/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.darwin.txt
+++ b/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.linux.txt b/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.linux-x86_64.txt
index 882d7f985e..882d7f985e 100644
--- a/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.linux.txt
+++ b/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.txt
+++ b/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sequenceproxy/CMakeLists.darwin.txt b/ydb/core/tx/sequenceproxy/CMakeLists.darwin-x86_64.txt
index 6721cb25be..6721cb25be 100644
--- a/ydb/core/tx/sequenceproxy/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sequenceproxy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sequenceproxy/CMakeLists.linux.txt b/ydb/core/tx/sequenceproxy/CMakeLists.linux-x86_64.txt
index 3481f5a84b..3481f5a84b 100644
--- a/ydb/core/tx/sequenceproxy/CMakeLists.linux.txt
+++ b/ydb/core/tx/sequenceproxy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sequenceproxy/CMakeLists.txt b/ydb/core/tx/sequenceproxy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sequenceproxy/CMakeLists.txt
+++ b/ydb/core/tx/sequenceproxy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sequenceproxy/public/CMakeLists.darwin.txt b/ydb/core/tx/sequenceproxy/public/CMakeLists.darwin-x86_64.txt
index db31ad4641..db31ad4641 100644
--- a/ydb/core/tx/sequenceproxy/public/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sequenceproxy/public/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sequenceproxy/public/CMakeLists.linux.txt b/ydb/core/tx/sequenceproxy/public/CMakeLists.linux-x86_64.txt
index f5e2d23541..f5e2d23541 100644
--- a/ydb/core/tx/sequenceproxy/public/CMakeLists.linux.txt
+++ b/ydb/core/tx/sequenceproxy/public/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sequenceproxy/public/CMakeLists.txt b/ydb/core/tx/sequenceproxy/public/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sequenceproxy/public/CMakeLists.txt
+++ b/ydb/core/tx/sequenceproxy/public/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sequenceproxy/ut/CMakeLists.darwin.txt b/ydb/core/tx/sequenceproxy/ut/CMakeLists.darwin-x86_64.txt
index 57652360b9..57652360b9 100644
--- a/ydb/core/tx/sequenceproxy/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sequenceproxy/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sequenceproxy/ut/CMakeLists.linux.txt b/ydb/core/tx/sequenceproxy/ut/CMakeLists.linux-x86_64.txt
index a102b69d76..a102b69d76 100644
--- a/ydb/core/tx/sequenceproxy/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/sequenceproxy/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sequenceproxy/ut/CMakeLists.txt b/ydb/core/tx/sequenceproxy/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sequenceproxy/ut/CMakeLists.txt
+++ b/ydb/core/tx/sequenceproxy/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sequenceshard/CMakeLists.darwin.txt b/ydb/core/tx/sequenceshard/CMakeLists.darwin-x86_64.txt
index fd516913ac..fd516913ac 100644
--- a/ydb/core/tx/sequenceshard/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sequenceshard/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sequenceshard/CMakeLists.linux.txt b/ydb/core/tx/sequenceshard/CMakeLists.linux-x86_64.txt
index 8452c94f2c..8452c94f2c 100644
--- a/ydb/core/tx/sequenceshard/CMakeLists.linux.txt
+++ b/ydb/core/tx/sequenceshard/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sequenceshard/CMakeLists.txt b/ydb/core/tx/sequenceshard/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sequenceshard/CMakeLists.txt
+++ b/ydb/core/tx/sequenceshard/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sequenceshard/public/CMakeLists.darwin.txt b/ydb/core/tx/sequenceshard/public/CMakeLists.darwin-x86_64.txt
index b70b20404b..b70b20404b 100644
--- a/ydb/core/tx/sequenceshard/public/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sequenceshard/public/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sequenceshard/public/CMakeLists.linux.txt b/ydb/core/tx/sequenceshard/public/CMakeLists.linux-x86_64.txt
index b654db1b44..b654db1b44 100644
--- a/ydb/core/tx/sequenceshard/public/CMakeLists.linux.txt
+++ b/ydb/core/tx/sequenceshard/public/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sequenceshard/public/CMakeLists.txt b/ydb/core/tx/sequenceshard/public/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sequenceshard/public/CMakeLists.txt
+++ b/ydb/core/tx/sequenceshard/public/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sequenceshard/public/ut/CMakeLists.darwin.txt b/ydb/core/tx/sequenceshard/public/ut/CMakeLists.darwin-x86_64.txt
index dd91674fcb..dd91674fcb 100644
--- a/ydb/core/tx/sequenceshard/public/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sequenceshard/public/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sequenceshard/public/ut/CMakeLists.linux.txt b/ydb/core/tx/sequenceshard/public/ut/CMakeLists.linux-x86_64.txt
index a700206bd1..a700206bd1 100644
--- a/ydb/core/tx/sequenceshard/public/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/sequenceshard/public/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sequenceshard/public/ut/CMakeLists.txt b/ydb/core/tx/sequenceshard/public/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sequenceshard/public/ut/CMakeLists.txt
+++ b/ydb/core/tx/sequenceshard/public/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sequenceshard/ut/CMakeLists.darwin.txt b/ydb/core/tx/sequenceshard/ut/CMakeLists.darwin-x86_64.txt
index 3601589d09..3601589d09 100644
--- a/ydb/core/tx/sequenceshard/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sequenceshard/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sequenceshard/ut/CMakeLists.linux.txt b/ydb/core/tx/sequenceshard/ut/CMakeLists.linux-x86_64.txt
index 2552e0ff50..2552e0ff50 100644
--- a/ydb/core/tx/sequenceshard/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/sequenceshard/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sequenceshard/ut/CMakeLists.txt b/ydb/core/tx/sequenceshard/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sequenceshard/ut/CMakeLists.txt
+++ b/ydb/core/tx/sequenceshard/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sharding/CMakeLists.darwin.txt b/ydb/core/tx/sharding/CMakeLists.darwin-x86_64.txt
index cab50904fd..cab50904fd 100644
--- a/ydb/core/tx/sharding/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sharding/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sharding/CMakeLists.linux.txt b/ydb/core/tx/sharding/CMakeLists.linux-x86_64.txt
index 5e70279493..5e70279493 100644
--- a/ydb/core/tx/sharding/CMakeLists.linux.txt
+++ b/ydb/core/tx/sharding/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sharding/CMakeLists.txt b/ydb/core/tx/sharding/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sharding/CMakeLists.txt
+++ b/ydb/core/tx/sharding/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/sharding/ut/CMakeLists.darwin.txt b/ydb/core/tx/sharding/ut/CMakeLists.darwin-x86_64.txt
index c60bb0dd91..c60bb0dd91 100644
--- a/ydb/core/tx/sharding/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/sharding/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/sharding/ut/CMakeLists.linux.txt b/ydb/core/tx/sharding/ut/CMakeLists.linux-x86_64.txt
index aa8b0faf5e..aa8b0faf5e 100644
--- a/ydb/core/tx/sharding/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/sharding/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/sharding/ut/CMakeLists.txt b/ydb/core/tx/sharding/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/sharding/ut/CMakeLists.txt
+++ b/ydb/core/tx/sharding/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tiering/CMakeLists.darwin.txt b/ydb/core/tx/tiering/CMakeLists.darwin-x86_64.txt
index 4b08fc0283..4b08fc0283 100644
--- a/ydb/core/tx/tiering/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tiering/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tiering/CMakeLists.linux.txt b/ydb/core/tx/tiering/CMakeLists.linux-x86_64.txt
index f2ac5fd618..f2ac5fd618 100644
--- a/ydb/core/tx/tiering/CMakeLists.linux.txt
+++ b/ydb/core/tx/tiering/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tiering/CMakeLists.txt b/ydb/core/tx/tiering/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tiering/CMakeLists.txt
+++ b/ydb/core/tx/tiering/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tiering/rule/CMakeLists.darwin.txt b/ydb/core/tx/tiering/rule/CMakeLists.darwin-x86_64.txt
index 9cf06ee67b..9cf06ee67b 100644
--- a/ydb/core/tx/tiering/rule/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tiering/rule/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tiering/rule/CMakeLists.linux.txt b/ydb/core/tx/tiering/rule/CMakeLists.linux-x86_64.txt
index 38d5d642b6..38d5d642b6 100644
--- a/ydb/core/tx/tiering/rule/CMakeLists.linux.txt
+++ b/ydb/core/tx/tiering/rule/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tiering/rule/CMakeLists.txt b/ydb/core/tx/tiering/rule/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tiering/rule/CMakeLists.txt
+++ b/ydb/core/tx/tiering/rule/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tiering/tier/CMakeLists.darwin.txt b/ydb/core/tx/tiering/tier/CMakeLists.darwin-x86_64.txt
index d07ec52387..d07ec52387 100644
--- a/ydb/core/tx/tiering/tier/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tiering/tier/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tiering/tier/CMakeLists.linux.txt b/ydb/core/tx/tiering/tier/CMakeLists.linux-x86_64.txt
index fe4dc07239..fe4dc07239 100644
--- a/ydb/core/tx/tiering/tier/CMakeLists.linux.txt
+++ b/ydb/core/tx/tiering/tier/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tiering/tier/CMakeLists.txt b/ydb/core/tx/tiering/tier/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tiering/tier/CMakeLists.txt
+++ b/ydb/core/tx/tiering/tier/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tiering/ut/CMakeLists.darwin.txt b/ydb/core/tx/tiering/ut/CMakeLists.darwin-x86_64.txt
index e30ea236e4..e30ea236e4 100644
--- a/ydb/core/tx/tiering/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tiering/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tiering/ut/CMakeLists.linux.txt b/ydb/core/tx/tiering/ut/CMakeLists.linux-x86_64.txt
index 7d2fbd9405..7d2fbd9405 100644
--- a/ydb/core/tx/tiering/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/tiering/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tiering/ut/CMakeLists.txt b/ydb/core/tx/tiering/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tiering/ut/CMakeLists.txt
+++ b/ydb/core/tx/tiering/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/time_cast/CMakeLists.darwin.txt b/ydb/core/tx/time_cast/CMakeLists.darwin-x86_64.txt
index 054f1eabe4..054f1eabe4 100644
--- a/ydb/core/tx/time_cast/CMakeLists.darwin.txt
+++ b/ydb/core/tx/time_cast/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/time_cast/CMakeLists.linux.txt b/ydb/core/tx/time_cast/CMakeLists.linux-x86_64.txt
index 9e53bc8466..9e53bc8466 100644
--- a/ydb/core/tx/time_cast/CMakeLists.linux.txt
+++ b/ydb/core/tx/time_cast/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/time_cast/CMakeLists.txt b/ydb/core/tx/time_cast/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/time_cast/CMakeLists.txt
+++ b/ydb/core/tx/time_cast/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/time_cast/ut/CMakeLists.darwin.txt b/ydb/core/tx/time_cast/ut/CMakeLists.darwin-x86_64.txt
index 19c781ba2e..19c781ba2e 100644
--- a/ydb/core/tx/time_cast/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/time_cast/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/time_cast/ut/CMakeLists.linux.txt b/ydb/core/tx/time_cast/ut/CMakeLists.linux-x86_64.txt
index 08897dcd77..08897dcd77 100644
--- a/ydb/core/tx/time_cast/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/time_cast/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/time_cast/ut/CMakeLists.txt b/ydb/core/tx/time_cast/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/time_cast/ut/CMakeLists.txt
+++ b/ydb/core/tx/time_cast/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_allocator/CMakeLists.darwin.txt b/ydb/core/tx/tx_allocator/CMakeLists.darwin-x86_64.txt
index df9580cfab..df9580cfab 100644
--- a/ydb/core/tx/tx_allocator/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_allocator/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_allocator/CMakeLists.linux.txt b/ydb/core/tx/tx_allocator/CMakeLists.linux-x86_64.txt
index 093b85ebe8..093b85ebe8 100644
--- a/ydb/core/tx/tx_allocator/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_allocator/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_allocator/CMakeLists.txt b/ydb/core/tx/tx_allocator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_allocator/CMakeLists.txt
+++ b/ydb/core/tx/tx_allocator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_allocator/ut/CMakeLists.darwin.txt b/ydb/core/tx/tx_allocator/ut/CMakeLists.darwin-x86_64.txt
index 159e770449..159e770449 100644
--- a/ydb/core/tx/tx_allocator/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_allocator/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_allocator/ut/CMakeLists.linux.txt b/ydb/core/tx/tx_allocator/ut/CMakeLists.linux-x86_64.txt
index 4fd8c27406..4fd8c27406 100644
--- a/ydb/core/tx/tx_allocator/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_allocator/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_allocator/ut/CMakeLists.txt b/ydb/core/tx/tx_allocator/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_allocator/ut/CMakeLists.txt
+++ b/ydb/core/tx/tx_allocator/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_allocator_client/CMakeLists.darwin.txt b/ydb/core/tx/tx_allocator_client/CMakeLists.darwin-x86_64.txt
index bc3c30c594..bc3c30c594 100644
--- a/ydb/core/tx/tx_allocator_client/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_allocator_client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_allocator_client/CMakeLists.linux.txt b/ydb/core/tx/tx_allocator_client/CMakeLists.linux-x86_64.txt
index 49bc2805a8..49bc2805a8 100644
--- a/ydb/core/tx/tx_allocator_client/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_allocator_client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_allocator_client/CMakeLists.txt b/ydb/core/tx/tx_allocator_client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_allocator_client/CMakeLists.txt
+++ b/ydb/core/tx/tx_allocator_client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_allocator_client/ut/CMakeLists.darwin.txt b/ydb/core/tx/tx_allocator_client/ut/CMakeLists.darwin-x86_64.txt
index d59b7bbb00..d59b7bbb00 100644
--- a/ydb/core/tx/tx_allocator_client/ut/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_allocator_client/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_allocator_client/ut/CMakeLists.linux.txt b/ydb/core/tx/tx_allocator_client/ut/CMakeLists.linux-x86_64.txt
index fabf0bf59e..fabf0bf59e 100644
--- a/ydb/core/tx/tx_allocator_client/ut/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_allocator_client/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_allocator_client/ut/CMakeLists.txt b/ydb/core/tx/tx_allocator_client/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_allocator_client/ut/CMakeLists.txt
+++ b/ydb/core/tx/tx_allocator_client/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_proxy/CMakeLists.darwin.txt b/ydb/core/tx/tx_proxy/CMakeLists.darwin-x86_64.txt
index bf765f4fca..bf765f4fca 100644
--- a/ydb/core/tx/tx_proxy/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_proxy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/CMakeLists.linux.txt b/ydb/core/tx/tx_proxy/CMakeLists.linux-x86_64.txt
index 786900b59f..786900b59f 100644
--- a/ydb/core/tx/tx_proxy/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_proxy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/CMakeLists.txt b/ydb/core/tx/tx_proxy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_proxy/CMakeLists.txt
+++ b/ydb/core/tx/tx_proxy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.darwin.txt b/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.darwin-x86_64.txt
index 5a106aefdf..5a106aefdf 100644
--- a/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.linux.txt b/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.linux-x86_64.txt
index b3131ff95c..b3131ff95c 100644
--- a/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.txt b/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.txt
+++ b/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.darwin.txt b/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.darwin-x86_64.txt
index 1684560b58..1684560b58 100644
--- a/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.linux.txt b/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.linux-x86_64.txt
index 93f30cd5d2..93f30cd5d2 100644
--- a/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.txt b/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.txt
+++ b/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.darwin.txt b/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.darwin-x86_64.txt
index 2d15ad7a0d..2d15ad7a0d 100644
--- a/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.linux.txt b/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.linux-x86_64.txt
index ed98c38380..ed98c38380 100644
--- a/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.txt b/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.txt
+++ b/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.darwin.txt b/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.darwin-x86_64.txt
index 7ca0508070..7ca0508070 100644
--- a/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.darwin.txt
+++ b/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.linux.txt b/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.linux-x86_64.txt
index 6added46c7..6added46c7 100644
--- a/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.linux.txt
+++ b/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.txt b/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.txt
+++ b/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/util/CMakeLists.darwin.txt b/ydb/core/util/CMakeLists.darwin-x86_64.txt
index 231a6222ba..231a6222ba 100644
--- a/ydb/core/util/CMakeLists.darwin.txt
+++ b/ydb/core/util/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/util/CMakeLists.linux.txt b/ydb/core/util/CMakeLists.linux-x86_64.txt
index 8cf634be3a..8cf634be3a 100644
--- a/ydb/core/util/CMakeLists.linux.txt
+++ b/ydb/core/util/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/util/CMakeLists.txt b/ydb/core/util/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/util/CMakeLists.txt
+++ b/ydb/core/util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/util/btree_benchmark/CMakeLists.darwin.txt b/ydb/core/util/btree_benchmark/CMakeLists.darwin-x86_64.txt
index 8bcc3d83cc..8bcc3d83cc 100644
--- a/ydb/core/util/btree_benchmark/CMakeLists.darwin.txt
+++ b/ydb/core/util/btree_benchmark/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/util/btree_benchmark/CMakeLists.linux.txt b/ydb/core/util/btree_benchmark/CMakeLists.linux-x86_64.txt
index 95fda6e9ab..95fda6e9ab 100644
--- a/ydb/core/util/btree_benchmark/CMakeLists.linux.txt
+++ b/ydb/core/util/btree_benchmark/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/util/btree_benchmark/CMakeLists.txt b/ydb/core/util/btree_benchmark/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/util/btree_benchmark/CMakeLists.txt
+++ b/ydb/core/util/btree_benchmark/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/util/ut/CMakeLists.darwin.txt b/ydb/core/util/ut/CMakeLists.darwin-x86_64.txt
index 738ae15249..738ae15249 100644
--- a/ydb/core/util/ut/CMakeLists.darwin.txt
+++ b/ydb/core/util/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/util/ut/CMakeLists.linux.txt b/ydb/core/util/ut/CMakeLists.linux-x86_64.txt
index 842c735662..842c735662 100644
--- a/ydb/core/util/ut/CMakeLists.linux.txt
+++ b/ydb/core/util/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/util/ut/CMakeLists.txt b/ydb/core/util/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/util/ut/CMakeLists.txt
+++ b/ydb/core/util/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/viewer/CMakeLists.darwin.txt b/ydb/core/viewer/CMakeLists.darwin-x86_64.txt
index b3fa682d72..b3fa682d72 100644
--- a/ydb/core/viewer/CMakeLists.darwin.txt
+++ b/ydb/core/viewer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/viewer/CMakeLists.linux.txt b/ydb/core/viewer/CMakeLists.linux-x86_64.txt
index e15b005240..e15b005240 100644
--- a/ydb/core/viewer/CMakeLists.linux.txt
+++ b/ydb/core/viewer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/viewer/CMakeLists.txt b/ydb/core/viewer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/viewer/CMakeLists.txt
+++ b/ydb/core/viewer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/viewer/json/CMakeLists.darwin.txt b/ydb/core/viewer/json/CMakeLists.darwin-x86_64.txt
index 6c8ae852b4..6c8ae852b4 100644
--- a/ydb/core/viewer/json/CMakeLists.darwin.txt
+++ b/ydb/core/viewer/json/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/viewer/json/CMakeLists.linux.txt b/ydb/core/viewer/json/CMakeLists.linux-x86_64.txt
index d9c7f45359..d9c7f45359 100644
--- a/ydb/core/viewer/json/CMakeLists.linux.txt
+++ b/ydb/core/viewer/json/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/viewer/json/CMakeLists.txt b/ydb/core/viewer/json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/viewer/json/CMakeLists.txt
+++ b/ydb/core/viewer/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/viewer/protos/CMakeLists.darwin.txt b/ydb/core/viewer/protos/CMakeLists.darwin-x86_64.txt
index 9928b65a1d..9928b65a1d 100644
--- a/ydb/core/viewer/protos/CMakeLists.darwin.txt
+++ b/ydb/core/viewer/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/viewer/protos/CMakeLists.linux.txt b/ydb/core/viewer/protos/CMakeLists.linux-x86_64.txt
index c7fe09bce3..c7fe09bce3 100644
--- a/ydb/core/viewer/protos/CMakeLists.linux.txt
+++ b/ydb/core/viewer/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/viewer/protos/CMakeLists.txt b/ydb/core/viewer/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/viewer/protos/CMakeLists.txt
+++ b/ydb/core/viewer/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/viewer/ut/CMakeLists.darwin.txt b/ydb/core/viewer/ut/CMakeLists.darwin-x86_64.txt
index 12f90e4343..12f90e4343 100644
--- a/ydb/core/viewer/ut/CMakeLists.darwin.txt
+++ b/ydb/core/viewer/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/viewer/ut/CMakeLists.linux.txt b/ydb/core/viewer/ut/CMakeLists.linux-x86_64.txt
index 1f7a5e6cc2..1f7a5e6cc2 100644
--- a/ydb/core/viewer/ut/CMakeLists.linux.txt
+++ b/ydb/core/viewer/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/viewer/ut/CMakeLists.txt b/ydb/core/viewer/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/viewer/ut/CMakeLists.txt
+++ b/ydb/core/viewer/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/wrappers/CMakeLists.darwin.txt b/ydb/core/wrappers/CMakeLists.darwin-x86_64.txt
index a6724661ab..a6724661ab 100644
--- a/ydb/core/wrappers/CMakeLists.darwin.txt
+++ b/ydb/core/wrappers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/wrappers/CMakeLists.linux.txt b/ydb/core/wrappers/CMakeLists.linux-x86_64.txt
index de9be9b8a7..de9be9b8a7 100644
--- a/ydb/core/wrappers/CMakeLists.linux.txt
+++ b/ydb/core/wrappers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/wrappers/CMakeLists.txt b/ydb/core/wrappers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/wrappers/CMakeLists.txt
+++ b/ydb/core/wrappers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/wrappers/events/CMakeLists.darwin.txt b/ydb/core/wrappers/events/CMakeLists.darwin-x86_64.txt
index 0caae2bb8b..0caae2bb8b 100644
--- a/ydb/core/wrappers/events/CMakeLists.darwin.txt
+++ b/ydb/core/wrappers/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/wrappers/events/CMakeLists.linux.txt b/ydb/core/wrappers/events/CMakeLists.linux-x86_64.txt
index 913a19d70d..913a19d70d 100644
--- a/ydb/core/wrappers/events/CMakeLists.linux.txt
+++ b/ydb/core/wrappers/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/wrappers/events/CMakeLists.txt b/ydb/core/wrappers/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/wrappers/events/CMakeLists.txt
+++ b/ydb/core/wrappers/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/wrappers/ut/CMakeLists.darwin.txt b/ydb/core/wrappers/ut/CMakeLists.darwin-x86_64.txt
index af59dcbdc2..af59dcbdc2 100644
--- a/ydb/core/wrappers/ut/CMakeLists.darwin.txt
+++ b/ydb/core/wrappers/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/wrappers/ut/CMakeLists.linux.txt b/ydb/core/wrappers/ut/CMakeLists.linux-x86_64.txt
index d630385828..d630385828 100644
--- a/ydb/core/wrappers/ut/CMakeLists.linux.txt
+++ b/ydb/core/wrappers/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/wrappers/ut/CMakeLists.txt b/ydb/core/wrappers/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/wrappers/ut/CMakeLists.txt
+++ b/ydb/core/wrappers/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/wrappers/ut_helpers/CMakeLists.darwin.txt b/ydb/core/wrappers/ut_helpers/CMakeLists.darwin-x86_64.txt
index 85d6760e33..85d6760e33 100644
--- a/ydb/core/wrappers/ut_helpers/CMakeLists.darwin.txt
+++ b/ydb/core/wrappers/ut_helpers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/wrappers/ut_helpers/CMakeLists.linux.txt b/ydb/core/wrappers/ut_helpers/CMakeLists.linux-x86_64.txt
index 4af0a226f3..4af0a226f3 100644
--- a/ydb/core/wrappers/ut_helpers/CMakeLists.linux.txt
+++ b/ydb/core/wrappers/ut_helpers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/wrappers/ut_helpers/CMakeLists.txt b/ydb/core/wrappers/ut_helpers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/wrappers/ut_helpers/CMakeLists.txt
+++ b/ydb/core/wrappers/ut_helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ydb_convert/CMakeLists.darwin.txt b/ydb/core/ydb_convert/CMakeLists.darwin-x86_64.txt
index cb46f19a8e..cb46f19a8e 100644
--- a/ydb/core/ydb_convert/CMakeLists.darwin.txt
+++ b/ydb/core/ydb_convert/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ydb_convert/CMakeLists.linux.txt b/ydb/core/ydb_convert/CMakeLists.linux-x86_64.txt
index 64a21db00c..64a21db00c 100644
--- a/ydb/core/ydb_convert/CMakeLists.linux.txt
+++ b/ydb/core/ydb_convert/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ydb_convert/CMakeLists.txt b/ydb/core/ydb_convert/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ydb_convert/CMakeLists.txt
+++ b/ydb/core/ydb_convert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ydb_convert/ut/CMakeLists.darwin.txt b/ydb/core/ydb_convert/ut/CMakeLists.darwin-x86_64.txt
index 091980d221..091980d221 100644
--- a/ydb/core/ydb_convert/ut/CMakeLists.darwin.txt
+++ b/ydb/core/ydb_convert/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ydb_convert/ut/CMakeLists.linux.txt b/ydb/core/ydb_convert/ut/CMakeLists.linux-x86_64.txt
index 1c49b0706c..1c49b0706c 100644
--- a/ydb/core/ydb_convert/ut/CMakeLists.linux.txt
+++ b/ydb/core/ydb_convert/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ydb_convert/ut/CMakeLists.txt b/ydb/core/ydb_convert/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ydb_convert/ut/CMakeLists.txt
+++ b/ydb/core/ydb_convert/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/actor/CMakeLists.darwin.txt b/ydb/core/ymq/actor/CMakeLists.darwin-x86_64.txt
index d020ddf06c..d020ddf06c 100644
--- a/ydb/core/ymq/actor/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/actor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/actor/CMakeLists.linux.txt b/ydb/core/ymq/actor/CMakeLists.linux-x86_64.txt
index ad19c4a953..ad19c4a953 100644
--- a/ydb/core/ymq/actor/CMakeLists.linux.txt
+++ b/ydb/core/ymq/actor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/actor/CMakeLists.txt b/ydb/core/ymq/actor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/actor/CMakeLists.txt
+++ b/ydb/core/ymq/actor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/actor/ut/CMakeLists.darwin.txt b/ydb/core/ymq/actor/ut/CMakeLists.darwin-x86_64.txt
index 7163ea3026..7163ea3026 100644
--- a/ydb/core/ymq/actor/ut/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/actor/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/actor/ut/CMakeLists.linux.txt b/ydb/core/ymq/actor/ut/CMakeLists.linux-x86_64.txt
index e0561f49ac..e0561f49ac 100644
--- a/ydb/core/ymq/actor/ut/CMakeLists.linux.txt
+++ b/ydb/core/ymq/actor/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/actor/ut/CMakeLists.txt b/ydb/core/ymq/actor/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/actor/ut/CMakeLists.txt
+++ b/ydb/core/ymq/actor/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/actor/yc_search_ut/CMakeLists.darwin.txt b/ydb/core/ymq/actor/yc_search_ut/CMakeLists.darwin-x86_64.txt
index c109f45944..c109f45944 100644
--- a/ydb/core/ymq/actor/yc_search_ut/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/actor/yc_search_ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/actor/yc_search_ut/CMakeLists.linux.txt b/ydb/core/ymq/actor/yc_search_ut/CMakeLists.linux-x86_64.txt
index 62aa881caf..62aa881caf 100644
--- a/ydb/core/ymq/actor/yc_search_ut/CMakeLists.linux.txt
+++ b/ydb/core/ymq/actor/yc_search_ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/actor/yc_search_ut/CMakeLists.txt b/ydb/core/ymq/actor/yc_search_ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/actor/yc_search_ut/CMakeLists.txt
+++ b/ydb/core/ymq/actor/yc_search_ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/base/CMakeLists.darwin.txt b/ydb/core/ymq/base/CMakeLists.darwin-x86_64.txt
index da63192d6c..da63192d6c 100644
--- a/ydb/core/ymq/base/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/base/CMakeLists.linux.txt b/ydb/core/ymq/base/CMakeLists.linux-x86_64.txt
index e2bdaf35dd..e2bdaf35dd 100644
--- a/ydb/core/ymq/base/CMakeLists.linux.txt
+++ b/ydb/core/ymq/base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/base/CMakeLists.txt b/ydb/core/ymq/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/base/CMakeLists.txt
+++ b/ydb/core/ymq/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/base/ut/CMakeLists.darwin.txt b/ydb/core/ymq/base/ut/CMakeLists.darwin-x86_64.txt
index b3c55f8553..b3c55f8553 100644
--- a/ydb/core/ymq/base/ut/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/base/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/base/ut/CMakeLists.linux.txt b/ydb/core/ymq/base/ut/CMakeLists.linux-x86_64.txt
index eb29e3f22b..eb29e3f22b 100644
--- a/ydb/core/ymq/base/ut/CMakeLists.linux.txt
+++ b/ydb/core/ymq/base/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/base/ut/CMakeLists.txt b/ydb/core/ymq/base/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/base/ut/CMakeLists.txt
+++ b/ydb/core/ymq/base/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/client/bin/CMakeLists.darwin.txt b/ydb/core/ymq/client/bin/CMakeLists.darwin-x86_64.txt
index c7db79695c..c7db79695c 100644
--- a/ydb/core/ymq/client/bin/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/client/bin/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/client/bin/CMakeLists.linux.txt b/ydb/core/ymq/client/bin/CMakeLists.linux-x86_64.txt
index 33245d1cde..33245d1cde 100644
--- a/ydb/core/ymq/client/bin/CMakeLists.linux.txt
+++ b/ydb/core/ymq/client/bin/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/client/bin/CMakeLists.txt b/ydb/core/ymq/client/bin/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/client/bin/CMakeLists.txt
+++ b/ydb/core/ymq/client/bin/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/client/cpp/CMakeLists.darwin.txt b/ydb/core/ymq/client/cpp/CMakeLists.darwin-x86_64.txt
index ddaaf42002..ddaaf42002 100644
--- a/ydb/core/ymq/client/cpp/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/client/cpp/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/client/cpp/CMakeLists.linux.txt b/ydb/core/ymq/client/cpp/CMakeLists.linux-x86_64.txt
index 4acc1d5e5e..4acc1d5e5e 100644
--- a/ydb/core/ymq/client/cpp/CMakeLists.linux.txt
+++ b/ydb/core/ymq/client/cpp/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/client/cpp/CMakeLists.txt b/ydb/core/ymq/client/cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/client/cpp/CMakeLists.txt
+++ b/ydb/core/ymq/client/cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/http/CMakeLists.darwin.txt b/ydb/core/ymq/http/CMakeLists.darwin-x86_64.txt
index 7b63f5201e..7b63f5201e 100644
--- a/ydb/core/ymq/http/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/http/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/http/CMakeLists.linux.txt b/ydb/core/ymq/http/CMakeLists.linux-x86_64.txt
index 6b9d4a0b9a..6b9d4a0b9a 100644
--- a/ydb/core/ymq/http/CMakeLists.linux.txt
+++ b/ydb/core/ymq/http/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/http/CMakeLists.txt b/ydb/core/ymq/http/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/http/CMakeLists.txt
+++ b/ydb/core/ymq/http/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/http/ut/CMakeLists.darwin.txt b/ydb/core/ymq/http/ut/CMakeLists.darwin-x86_64.txt
index c97d40d796..c97d40d796 100644
--- a/ydb/core/ymq/http/ut/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/http/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/http/ut/CMakeLists.linux.txt b/ydb/core/ymq/http/ut/CMakeLists.linux-x86_64.txt
index 87b72da6cc..87b72da6cc 100644
--- a/ydb/core/ymq/http/ut/CMakeLists.linux.txt
+++ b/ydb/core/ymq/http/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/http/ut/CMakeLists.txt b/ydb/core/ymq/http/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/http/ut/CMakeLists.txt
+++ b/ydb/core/ymq/http/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/proto/CMakeLists.darwin.txt b/ydb/core/ymq/proto/CMakeLists.darwin-x86_64.txt
index 5be1241c6f..5be1241c6f 100644
--- a/ydb/core/ymq/proto/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/proto/CMakeLists.linux.txt b/ydb/core/ymq/proto/CMakeLists.linux-x86_64.txt
index da8e31b84d..da8e31b84d 100644
--- a/ydb/core/ymq/proto/CMakeLists.linux.txt
+++ b/ydb/core/ymq/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/proto/CMakeLists.txt b/ydb/core/ymq/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/proto/CMakeLists.txt
+++ b/ydb/core/ymq/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/queues/common/CMakeLists.darwin.txt b/ydb/core/ymq/queues/common/CMakeLists.darwin-x86_64.txt
index 4f2873013c..4f2873013c 100644
--- a/ydb/core/ymq/queues/common/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/queues/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/queues/common/CMakeLists.linux.txt b/ydb/core/ymq/queues/common/CMakeLists.linux-x86_64.txt
index aee95c3fc0..aee95c3fc0 100644
--- a/ydb/core/ymq/queues/common/CMakeLists.linux.txt
+++ b/ydb/core/ymq/queues/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/queues/common/CMakeLists.txt b/ydb/core/ymq/queues/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/queues/common/CMakeLists.txt
+++ b/ydb/core/ymq/queues/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/queues/fifo/CMakeLists.darwin.txt b/ydb/core/ymq/queues/fifo/CMakeLists.darwin-x86_64.txt
index d2c77f1882..d2c77f1882 100644
--- a/ydb/core/ymq/queues/fifo/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/queues/fifo/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/queues/fifo/CMakeLists.linux.txt b/ydb/core/ymq/queues/fifo/CMakeLists.linux-x86_64.txt
index 8cc82f3fe6..8cc82f3fe6 100644
--- a/ydb/core/ymq/queues/fifo/CMakeLists.linux.txt
+++ b/ydb/core/ymq/queues/fifo/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/queues/fifo/CMakeLists.txt b/ydb/core/ymq/queues/fifo/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/queues/fifo/CMakeLists.txt
+++ b/ydb/core/ymq/queues/fifo/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/queues/std/CMakeLists.darwin.txt b/ydb/core/ymq/queues/std/CMakeLists.darwin-x86_64.txt
index 4254e9dfc2..4254e9dfc2 100644
--- a/ydb/core/ymq/queues/std/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/queues/std/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/queues/std/CMakeLists.linux.txt b/ydb/core/ymq/queues/std/CMakeLists.linux-x86_64.txt
index 3a96172efe..3a96172efe 100644
--- a/ydb/core/ymq/queues/std/CMakeLists.linux.txt
+++ b/ydb/core/ymq/queues/std/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/queues/std/CMakeLists.txt b/ydb/core/ymq/queues/std/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/queues/std/CMakeLists.txt
+++ b/ydb/core/ymq/queues/std/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/ymq/ut/CMakeLists.darwin.txt b/ydb/core/ymq/ut/CMakeLists.darwin-x86_64.txt
index 2e4fd4c015..2e4fd4c015 100644
--- a/ydb/core/ymq/ut/CMakeLists.darwin.txt
+++ b/ydb/core/ymq/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/ymq/ut/CMakeLists.linux.txt b/ydb/core/ymq/ut/CMakeLists.linux-x86_64.txt
index 9de2776b61..9de2776b61 100644
--- a/ydb/core/ymq/ut/CMakeLists.linux.txt
+++ b/ydb/core/ymq/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/ymq/ut/CMakeLists.txt b/ydb/core/ymq/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/ymq/ut/CMakeLists.txt
+++ b/ydb/core/ymq/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/actors/CMakeLists.darwin.txt b/ydb/core/yq/libs/actors/CMakeLists.darwin-x86_64.txt
index 9ff690e759..9ff690e759 100644
--- a/ydb/core/yq/libs/actors/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/actors/CMakeLists.linux.txt b/ydb/core/yq/libs/actors/CMakeLists.linux-x86_64.txt
index a363ba10cb..a363ba10cb 100644
--- a/ydb/core/yq/libs/actors/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/actors/CMakeLists.txt b/ydb/core/yq/libs/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/actors/CMakeLists.txt
+++ b/ydb/core/yq/libs/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/actors/logging/CMakeLists.darwin.txt b/ydb/core/yq/libs/actors/logging/CMakeLists.darwin-x86_64.txt
index dbf7721d31..dbf7721d31 100644
--- a/ydb/core/yq/libs/actors/logging/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/actors/logging/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/actors/logging/CMakeLists.linux.txt b/ydb/core/yq/libs/actors/logging/CMakeLists.linux-x86_64.txt
index acf36fb18d..acf36fb18d 100644
--- a/ydb/core/yq/libs/actors/logging/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/actors/logging/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/actors/logging/CMakeLists.txt b/ydb/core/yq/libs/actors/logging/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/actors/logging/CMakeLists.txt
+++ b/ydb/core/yq/libs/actors/logging/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/audit/CMakeLists.darwin.txt b/ydb/core/yq/libs/audit/CMakeLists.darwin-x86_64.txt
index c335dad443..c335dad443 100644
--- a/ydb/core/yq/libs/audit/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/audit/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/audit/CMakeLists.linux.txt b/ydb/core/yq/libs/audit/CMakeLists.linux-x86_64.txt
index 1af4e0ce61..1af4e0ce61 100644
--- a/ydb/core/yq/libs/audit/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/audit/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/audit/CMakeLists.txt b/ydb/core/yq/libs/audit/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/audit/CMakeLists.txt
+++ b/ydb/core/yq/libs/audit/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/audit/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/audit/events/CMakeLists.darwin-x86_64.txt
index be300eb773..be300eb773 100644
--- a/ydb/core/yq/libs/audit/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/audit/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/audit/events/CMakeLists.linux.txt b/ydb/core/yq/libs/audit/events/CMakeLists.linux-x86_64.txt
index 4465d0df85..4465d0df85 100644
--- a/ydb/core/yq/libs/audit/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/audit/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/audit/events/CMakeLists.txt b/ydb/core/yq/libs/audit/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/audit/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/audit/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/checkpoint_storage/CMakeLists.darwin.txt b/ydb/core/yq/libs/checkpoint_storage/CMakeLists.darwin-x86_64.txt
index dbe5e40a62..dbe5e40a62 100644
--- a/ydb/core/yq/libs/checkpoint_storage/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpoint_storage/CMakeLists.linux.txt b/ydb/core/yq/libs/checkpoint_storage/CMakeLists.linux-x86_64.txt
index 258716a28e..258716a28e 100644
--- a/ydb/core/yq/libs/checkpoint_storage/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpoint_storage/CMakeLists.txt b/ydb/core/yq/libs/checkpoint_storage/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/checkpoint_storage/CMakeLists.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.darwin-x86_64.txt
index 06644053cb..06644053cb 100644
--- a/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.linux.txt b/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.linux-x86_64.txt
index be0f67f9af..be0f67f9af 100644
--- a/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.txt b/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.darwin.txt b/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.darwin-x86_64.txt
index c68be3d9d7..c68be3d9d7 100644
--- a/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.linux.txt b/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.linux-x86_64.txt
index f4eea50f90..f4eea50f90 100644
--- a/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.txt b/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.txt
+++ b/ydb/core/yq/libs/checkpoint_storage/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/checkpointing/CMakeLists.darwin.txt b/ydb/core/yq/libs/checkpointing/CMakeLists.darwin-x86_64.txt
index 5c3b002469..5c3b002469 100644
--- a/ydb/core/yq/libs/checkpointing/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/checkpointing/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpointing/CMakeLists.linux.txt b/ydb/core/yq/libs/checkpointing/CMakeLists.linux-x86_64.txt
index c7e952c5e9..c7e952c5e9 100644
--- a/ydb/core/yq/libs/checkpointing/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/checkpointing/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpointing/CMakeLists.txt b/ydb/core/yq/libs/checkpointing/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/checkpointing/CMakeLists.txt
+++ b/ydb/core/yq/libs/checkpointing/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/checkpointing/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/checkpointing/events/CMakeLists.darwin-x86_64.txt
index 1460969835..1460969835 100644
--- a/ydb/core/yq/libs/checkpointing/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/checkpointing/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpointing/events/CMakeLists.linux.txt b/ydb/core/yq/libs/checkpointing/events/CMakeLists.linux-x86_64.txt
index 33ddf79d6a..33ddf79d6a 100644
--- a/ydb/core/yq/libs/checkpointing/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/checkpointing/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpointing/events/CMakeLists.txt b/ydb/core/yq/libs/checkpointing/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/checkpointing/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/checkpointing/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/checkpointing/ut/CMakeLists.darwin.txt b/ydb/core/yq/libs/checkpointing/ut/CMakeLists.darwin-x86_64.txt
index bd1a614346..bd1a614346 100644
--- a/ydb/core/yq/libs/checkpointing/ut/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/checkpointing/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpointing/ut/CMakeLists.linux.txt b/ydb/core/yq/libs/checkpointing/ut/CMakeLists.linux-x86_64.txt
index c2d919d16a..c2d919d16a 100644
--- a/ydb/core/yq/libs/checkpointing/ut/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/checkpointing/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpointing/ut/CMakeLists.txt b/ydb/core/yq/libs/checkpointing/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/checkpointing/ut/CMakeLists.txt
+++ b/ydb/core/yq/libs/checkpointing/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/checkpointing_common/CMakeLists.darwin.txt b/ydb/core/yq/libs/checkpointing_common/CMakeLists.darwin-x86_64.txt
index f146c6a7fa..f146c6a7fa 100644
--- a/ydb/core/yq/libs/checkpointing_common/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/checkpointing_common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpointing_common/CMakeLists.linux.txt b/ydb/core/yq/libs/checkpointing_common/CMakeLists.linux-x86_64.txt
index 9417e91f65..9417e91f65 100644
--- a/ydb/core/yq/libs/checkpointing_common/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/checkpointing_common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/checkpointing_common/CMakeLists.txt b/ydb/core/yq/libs/checkpointing_common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/checkpointing_common/CMakeLists.txt
+++ b/ydb/core/yq/libs/checkpointing_common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/cloud_audit/CMakeLists.darwin.txt b/ydb/core/yq/libs/cloud_audit/CMakeLists.darwin-x86_64.txt
index c98b5373f8..c98b5373f8 100644
--- a/ydb/core/yq/libs/cloud_audit/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/cloud_audit/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/cloud_audit/CMakeLists.linux.txt b/ydb/core/yq/libs/cloud_audit/CMakeLists.linux-x86_64.txt
index b0e3c06141..b0e3c06141 100644
--- a/ydb/core/yq/libs/cloud_audit/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/cloud_audit/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/cloud_audit/CMakeLists.txt b/ydb/core/yq/libs/cloud_audit/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/cloud_audit/CMakeLists.txt
+++ b/ydb/core/yq/libs/cloud_audit/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/common/CMakeLists.darwin.txt b/ydb/core/yq/libs/common/CMakeLists.darwin-x86_64.txt
index 9784279731..9784279731 100644
--- a/ydb/core/yq/libs/common/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/common/CMakeLists.linux.txt b/ydb/core/yq/libs/common/CMakeLists.linux-x86_64.txt
index e37fff1049..e37fff1049 100644
--- a/ydb/core/yq/libs/common/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/common/CMakeLists.txt b/ydb/core/yq/libs/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/common/CMakeLists.txt
+++ b/ydb/core/yq/libs/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/common/ut/CMakeLists.darwin.txt b/ydb/core/yq/libs/common/ut/CMakeLists.darwin-x86_64.txt
index 5875991b22..5875991b22 100644
--- a/ydb/core/yq/libs/common/ut/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/common/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/common/ut/CMakeLists.linux.txt b/ydb/core/yq/libs/common/ut/CMakeLists.linux-x86_64.txt
index f9f19aeb55..f9f19aeb55 100644
--- a/ydb/core/yq/libs/common/ut/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/common/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/common/ut/CMakeLists.txt b/ydb/core/yq/libs/common/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/common/ut/CMakeLists.txt
+++ b/ydb/core/yq/libs/common/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/config/CMakeLists.darwin.txt b/ydb/core/yq/libs/config/CMakeLists.darwin-x86_64.txt
index e6994fdc3d..e6994fdc3d 100644
--- a/ydb/core/yq/libs/config/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/config/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/config/CMakeLists.linux.txt b/ydb/core/yq/libs/config/CMakeLists.linux-x86_64.txt
index 8089092291..8089092291 100644
--- a/ydb/core/yq/libs/config/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/config/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/config/CMakeLists.txt b/ydb/core/yq/libs/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/config/CMakeLists.txt
+++ b/ydb/core/yq/libs/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/config/protos/CMakeLists.darwin.txt b/ydb/core/yq/libs/config/protos/CMakeLists.darwin-x86_64.txt
index 544e173359..544e173359 100644
--- a/ydb/core/yq/libs/config/protos/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/config/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/config/protos/CMakeLists.linux.txt b/ydb/core/yq/libs/config/protos/CMakeLists.linux-x86_64.txt
index ffa5253d32..ffa5253d32 100644
--- a/ydb/core/yq/libs/config/protos/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/config/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/config/protos/CMakeLists.txt b/ydb/core/yq/libs/config/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/config/protos/CMakeLists.txt
+++ b/ydb/core/yq/libs/config/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_config/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_config/CMakeLists.darwin-x86_64.txt
index 94f7c1ddcc..94f7c1ddcc 100644
--- a/ydb/core/yq/libs/control_plane_config/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_config/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_config/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_config/CMakeLists.linux-x86_64.txt
index e2a6f31047..e2a6f31047 100644
--- a/ydb/core/yq/libs/control_plane_config/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_config/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_config/CMakeLists.txt b/ydb/core/yq/libs/control_plane_config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_config/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_config/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_config/events/CMakeLists.darwin-x86_64.txt
index cde3f254d6..cde3f254d6 100644
--- a/ydb/core/yq/libs/control_plane_config/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_config/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_config/events/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_config/events/CMakeLists.linux-x86_64.txt
index bd9cfc5092..bd9cfc5092 100644
--- a/ydb/core/yq/libs/control_plane_config/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_config/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_config/events/CMakeLists.txt b/ydb/core/yq/libs/control_plane_config/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_config/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_config/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_proxy/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_proxy/CMakeLists.darwin-x86_64.txt
index d150a97277..d150a97277 100644
--- a/ydb/core/yq/libs/control_plane_proxy/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_proxy/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_proxy/CMakeLists.linux-x86_64.txt
index b0bce7c0b1..b0bce7c0b1 100644
--- a/ydb/core/yq/libs/control_plane_proxy/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_proxy/CMakeLists.txt b/ydb/core/yq/libs/control_plane_proxy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_proxy/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.darwin-x86_64.txt
index f17c977e58..f17c977e58 100644
--- a/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.linux-x86_64.txt
index 20922df5d1..20922df5d1 100644
--- a/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.txt b/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.darwin-x86_64.txt
index 194012b114..194012b114 100644
--- a/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.linux-x86_64.txt
index 49df2e31fe..49df2e31fe 100644
--- a/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.txt b/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_storage/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_storage/CMakeLists.darwin-x86_64.txt
index 933946e04b..933946e04b 100644
--- a/ydb/core/yq/libs/control_plane_storage/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_storage/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_storage/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_storage/CMakeLists.linux-x86_64.txt
index 6e4bcea501..6e4bcea501 100644
--- a/ydb/core/yq/libs/control_plane_storage/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_storage/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_storage/CMakeLists.txt b/ydb/core/yq/libs/control_plane_storage/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_storage/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_storage/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.darwin-x86_64.txt
index ac3e5213cc..ac3e5213cc 100644
--- a/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.linux-x86_64.txt
index 6473a843b3..6473a843b3 100644
--- a/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.txt b/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_storage/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.darwin-x86_64.txt
index 663f18cb5c..663f18cb5c 100644
--- a/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.linux-x86_64.txt
index 861c5ef59c..861c5ef59c 100644
--- a/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.txt b/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_storage/internal/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.darwin.txt b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.darwin-x86_64.txt
index 39d143125e..39d143125e 100644
--- a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.linux.txt b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.linux-x86_64.txt
index 5cc9efba14..5cc9efba14 100644
--- a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
+++ b/ydb/core/yq/libs/control_plane_storage/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.darwin.txt b/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.darwin-x86_64.txt
index c6a5eead08..c6a5eead08 100644
--- a/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.linux.txt b/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.linux-x86_64.txt
index e0b9264f90..e0b9264f90 100644
--- a/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.txt b/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.txt
+++ b/ydb/core/yq/libs/db_id_async_resolver_impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/db_schema/CMakeLists.darwin.txt b/ydb/core/yq/libs/db_schema/CMakeLists.darwin-x86_64.txt
index 2243665db1..2243665db1 100644
--- a/ydb/core/yq/libs/db_schema/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/db_schema/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/db_schema/CMakeLists.linux.txt b/ydb/core/yq/libs/db_schema/CMakeLists.linux-x86_64.txt
index 56605eb5b0..56605eb5b0 100644
--- a/ydb/core/yq/libs/db_schema/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/db_schema/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/db_schema/CMakeLists.txt b/ydb/core/yq/libs/db_schema/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/db_schema/CMakeLists.txt
+++ b/ydb/core/yq/libs/db_schema/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/events/CMakeLists.darwin-x86_64.txt
index 0433916a53..0433916a53 100644
--- a/ydb/core/yq/libs/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/events/CMakeLists.linux.txt b/ydb/core/yq/libs/events/CMakeLists.linux-x86_64.txt
index 6b72b52fbd..6b72b52fbd 100644
--- a/ydb/core/yq/libs/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/events/CMakeLists.txt b/ydb/core/yq/libs/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/exceptions/CMakeLists.darwin.txt b/ydb/core/yq/libs/exceptions/CMakeLists.darwin-x86_64.txt
index d3e0c08314..d3e0c08314 100644
--- a/ydb/core/yq/libs/exceptions/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/exceptions/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/exceptions/CMakeLists.linux.txt b/ydb/core/yq/libs/exceptions/CMakeLists.linux-x86_64.txt
index ad785f3b1a..ad785f3b1a 100644
--- a/ydb/core/yq/libs/exceptions/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/exceptions/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/exceptions/CMakeLists.txt b/ydb/core/yq/libs/exceptions/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/exceptions/CMakeLists.txt
+++ b/ydb/core/yq/libs/exceptions/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/gateway/CMakeLists.darwin.txt b/ydb/core/yq/libs/gateway/CMakeLists.darwin-x86_64.txt
index 69e4975322..69e4975322 100644
--- a/ydb/core/yq/libs/gateway/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/gateway/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/gateway/CMakeLists.linux.txt b/ydb/core/yq/libs/gateway/CMakeLists.linux-x86_64.txt
index cb0c00744d..cb0c00744d 100644
--- a/ydb/core/yq/libs/gateway/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/gateway/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/gateway/CMakeLists.txt b/ydb/core/yq/libs/gateway/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/gateway/CMakeLists.txt
+++ b/ydb/core/yq/libs/gateway/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/graph_params/proto/CMakeLists.darwin.txt b/ydb/core/yq/libs/graph_params/proto/CMakeLists.darwin-x86_64.txt
index 1550f58697..1550f58697 100644
--- a/ydb/core/yq/libs/graph_params/proto/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/graph_params/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/graph_params/proto/CMakeLists.linux.txt b/ydb/core/yq/libs/graph_params/proto/CMakeLists.linux-x86_64.txt
index 46c16ebd0a..46c16ebd0a 100644
--- a/ydb/core/yq/libs/graph_params/proto/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/graph_params/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/graph_params/proto/CMakeLists.txt b/ydb/core/yq/libs/graph_params/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/graph_params/proto/CMakeLists.txt
+++ b/ydb/core/yq/libs/graph_params/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/grpc/CMakeLists.darwin.txt b/ydb/core/yq/libs/grpc/CMakeLists.darwin-x86_64.txt
index ba3d5bf403..ba3d5bf403 100644
--- a/ydb/core/yq/libs/grpc/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/grpc/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/grpc/CMakeLists.linux.txt b/ydb/core/yq/libs/grpc/CMakeLists.linux-x86_64.txt
index c5ac563d94..c5ac563d94 100644
--- a/ydb/core/yq/libs/grpc/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/grpc/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/grpc/CMakeLists.txt b/ydb/core/yq/libs/grpc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/grpc/CMakeLists.txt
+++ b/ydb/core/yq/libs/grpc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/health/CMakeLists.darwin.txt b/ydb/core/yq/libs/health/CMakeLists.darwin-x86_64.txt
index 139168c1d9..139168c1d9 100644
--- a/ydb/core/yq/libs/health/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/health/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/health/CMakeLists.linux.txt b/ydb/core/yq/libs/health/CMakeLists.linux-x86_64.txt
index c05242a04c..c05242a04c 100644
--- a/ydb/core/yq/libs/health/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/health/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/health/CMakeLists.txt b/ydb/core/yq/libs/health/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/health/CMakeLists.txt
+++ b/ydb/core/yq/libs/health/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/hmac/CMakeLists.darwin.txt b/ydb/core/yq/libs/hmac/CMakeLists.darwin-x86_64.txt
index e03a23eecb..e03a23eecb 100644
--- a/ydb/core/yq/libs/hmac/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/hmac/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/hmac/CMakeLists.linux.txt b/ydb/core/yq/libs/hmac/CMakeLists.linux-x86_64.txt
index 0d3ba30fb4..0d3ba30fb4 100644
--- a/ydb/core/yq/libs/hmac/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/hmac/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/hmac/CMakeLists.txt b/ydb/core/yq/libs/hmac/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/hmac/CMakeLists.txt
+++ b/ydb/core/yq/libs/hmac/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/hmac/ut/CMakeLists.darwin.txt b/ydb/core/yq/libs/hmac/ut/CMakeLists.darwin-x86_64.txt
index e1c897575b..e1c897575b 100644
--- a/ydb/core/yq/libs/hmac/ut/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/hmac/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/hmac/ut/CMakeLists.linux.txt b/ydb/core/yq/libs/hmac/ut/CMakeLists.linux-x86_64.txt
index e684473f19..e684473f19 100644
--- a/ydb/core/yq/libs/hmac/ut/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/hmac/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/hmac/ut/CMakeLists.txt b/ydb/core/yq/libs/hmac/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/hmac/ut/CMakeLists.txt
+++ b/ydb/core/yq/libs/hmac/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/init/CMakeLists.darwin.txt b/ydb/core/yq/libs/init/CMakeLists.darwin-x86_64.txt
index bdc398d459..bdc398d459 100644
--- a/ydb/core/yq/libs/init/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/init/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/init/CMakeLists.linux.txt b/ydb/core/yq/libs/init/CMakeLists.linux-x86_64.txt
index ca1957493c..ca1957493c 100644
--- a/ydb/core/yq/libs/init/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/init/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/init/CMakeLists.txt b/ydb/core/yq/libs/init/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/init/CMakeLists.txt
+++ b/ydb/core/yq/libs/init/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/logs/CMakeLists.darwin.txt b/ydb/core/yq/libs/logs/CMakeLists.darwin-x86_64.txt
index ca07f5769c..ca07f5769c 100644
--- a/ydb/core/yq/libs/logs/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/logs/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/logs/CMakeLists.linux.txt b/ydb/core/yq/libs/logs/CMakeLists.linux-x86_64.txt
index 64553751b6..64553751b6 100644
--- a/ydb/core/yq/libs/logs/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/logs/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/logs/CMakeLists.txt b/ydb/core/yq/libs/logs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/logs/CMakeLists.txt
+++ b/ydb/core/yq/libs/logs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/mock/CMakeLists.darwin.txt b/ydb/core/yq/libs/mock/CMakeLists.darwin-x86_64.txt
index a5f8f139ce..a5f8f139ce 100644
--- a/ydb/core/yq/libs/mock/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/mock/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/mock/CMakeLists.linux.txt b/ydb/core/yq/libs/mock/CMakeLists.linux-x86_64.txt
index 4a21994fc4..4a21994fc4 100644
--- a/ydb/core/yq/libs/mock/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/mock/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/mock/CMakeLists.txt b/ydb/core/yq/libs/mock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/mock/CMakeLists.txt
+++ b/ydb/core/yq/libs/mock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/pretty_printers/CMakeLists.darwin.txt b/ydb/core/yq/libs/pretty_printers/CMakeLists.darwin-x86_64.txt
index 4922a82812..4922a82812 100644
--- a/ydb/core/yq/libs/pretty_printers/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/pretty_printers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/pretty_printers/CMakeLists.linux.txt b/ydb/core/yq/libs/pretty_printers/CMakeLists.linux-x86_64.txt
index ed89dbf66f..ed89dbf66f 100644
--- a/ydb/core/yq/libs/pretty_printers/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/pretty_printers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/pretty_printers/CMakeLists.txt b/ydb/core/yq/libs/pretty_printers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/pretty_printers/CMakeLists.txt
+++ b/ydb/core/yq/libs/pretty_printers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/private_client/CMakeLists.darwin.txt b/ydb/core/yq/libs/private_client/CMakeLists.darwin-x86_64.txt
index 49d1348098..49d1348098 100644
--- a/ydb/core/yq/libs/private_client/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/private_client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/private_client/CMakeLists.linux.txt b/ydb/core/yq/libs/private_client/CMakeLists.linux-x86_64.txt
index 56b5c7eccd..56b5c7eccd 100644
--- a/ydb/core/yq/libs/private_client/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/private_client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/private_client/CMakeLists.txt b/ydb/core/yq/libs/private_client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/private_client/CMakeLists.txt
+++ b/ydb/core/yq/libs/private_client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/protos/CMakeLists.darwin.txt b/ydb/core/yq/libs/protos/CMakeLists.darwin-x86_64.txt
index 7ad8a52d89..7ad8a52d89 100644
--- a/ydb/core/yq/libs/protos/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/protos/CMakeLists.linux.txt b/ydb/core/yq/libs/protos/CMakeLists.linux-x86_64.txt
index 971db83d17..971db83d17 100644
--- a/ydb/core/yq/libs/protos/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/protos/CMakeLists.txt b/ydb/core/yq/libs/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/protos/CMakeLists.txt
+++ b/ydb/core/yq/libs/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/quota_manager/CMakeLists.darwin.txt b/ydb/core/yq/libs/quota_manager/CMakeLists.darwin-x86_64.txt
index e1b5ab26c6..e1b5ab26c6 100644
--- a/ydb/core/yq/libs/quota_manager/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/quota_manager/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/quota_manager/CMakeLists.linux.txt b/ydb/core/yq/libs/quota_manager/CMakeLists.linux-x86_64.txt
index bb13308f8f..bb13308f8f 100644
--- a/ydb/core/yq/libs/quota_manager/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/quota_manager/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/quota_manager/CMakeLists.txt b/ydb/core/yq/libs/quota_manager/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/quota_manager/CMakeLists.txt
+++ b/ydb/core/yq/libs/quota_manager/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/quota_manager/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/quota_manager/events/CMakeLists.darwin-x86_64.txt
index ea0e549fb1..ea0e549fb1 100644
--- a/ydb/core/yq/libs/quota_manager/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/quota_manager/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/quota_manager/events/CMakeLists.linux.txt b/ydb/core/yq/libs/quota_manager/events/CMakeLists.linux-x86_64.txt
index b3c558259d..b3c558259d 100644
--- a/ydb/core/yq/libs/quota_manager/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/quota_manager/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/quota_manager/events/CMakeLists.txt b/ydb/core/yq/libs/quota_manager/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/quota_manager/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/quota_manager/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/quota_manager/proto/CMakeLists.darwin.txt b/ydb/core/yq/libs/quota_manager/proto/CMakeLists.darwin-x86_64.txt
index 64537374ca..64537374ca 100644
--- a/ydb/core/yq/libs/quota_manager/proto/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/quota_manager/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/quota_manager/proto/CMakeLists.linux.txt b/ydb/core/yq/libs/quota_manager/proto/CMakeLists.linux-x86_64.txt
index 1d075cc42a..1d075cc42a 100644
--- a/ydb/core/yq/libs/quota_manager/proto/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/quota_manager/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/quota_manager/proto/CMakeLists.txt b/ydb/core/yq/libs/quota_manager/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/quota_manager/proto/CMakeLists.txt
+++ b/ydb/core/yq/libs/quota_manager/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.darwin.txt b/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.darwin-x86_64.txt
index 1626b4cb8f..1626b4cb8f 100644
--- a/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.linux.txt b/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.linux-x86_64.txt
index 67154f4f01..67154f4f01 100644
--- a/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.txt b/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.txt
+++ b/ydb/core/yq/libs/quota_manager/ut_helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.darwin.txt b/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.darwin-x86_64.txt
index 5ef82db9e3..5ef82db9e3 100644
--- a/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.linux.txt b/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.linux-x86_64.txt
index a1ccc3177e..a1ccc3177e 100644
--- a/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.txt b/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.txt
+++ b/ydb/core/yq/libs/rate_limiter/control_plane_service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/rate_limiter/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/rate_limiter/events/CMakeLists.darwin-x86_64.txt
index cdda2b3ff3..cdda2b3ff3 100644
--- a/ydb/core/yq/libs/rate_limiter/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/rate_limiter/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/rate_limiter/events/CMakeLists.linux.txt b/ydb/core/yq/libs/rate_limiter/events/CMakeLists.linux-x86_64.txt
index 5f3e23f6f0..5f3e23f6f0 100644
--- a/ydb/core/yq/libs/rate_limiter/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/rate_limiter/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/rate_limiter/events/CMakeLists.txt b/ydb/core/yq/libs/rate_limiter/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/rate_limiter/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/rate_limiter/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.darwin.txt b/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.darwin-x86_64.txt
index 386b8b3251..386b8b3251 100644
--- a/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.linux.txt b/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.linux-x86_64.txt
index 6d9e3c1420..6d9e3c1420 100644
--- a/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.txt b/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.txt
+++ b/ydb/core/yq/libs/rate_limiter/quoter_service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.darwin.txt b/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.darwin-x86_64.txt
index 0ca322f3c2..0ca322f3c2 100644
--- a/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.linux.txt b/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.linux-x86_64.txt
index c99c5935b3..c99c5935b3 100644
--- a/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.txt b/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.txt
+++ b/ydb/core/yq/libs/rate_limiter/utils/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/read_rule/CMakeLists.darwin.txt b/ydb/core/yq/libs/read_rule/CMakeLists.darwin-x86_64.txt
index 1bc21f5a2d..1bc21f5a2d 100644
--- a/ydb/core/yq/libs/read_rule/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/read_rule/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/read_rule/CMakeLists.linux.txt b/ydb/core/yq/libs/read_rule/CMakeLists.linux-x86_64.txt
index 6f204524e0..6f204524e0 100644
--- a/ydb/core/yq/libs/read_rule/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/read_rule/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/read_rule/CMakeLists.txt b/ydb/core/yq/libs/read_rule/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/read_rule/CMakeLists.txt
+++ b/ydb/core/yq/libs/read_rule/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/result_formatter/CMakeLists.darwin.txt b/ydb/core/yq/libs/result_formatter/CMakeLists.darwin-x86_64.txt
index 2954dbc509..2954dbc509 100644
--- a/ydb/core/yq/libs/result_formatter/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/result_formatter/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/result_formatter/CMakeLists.linux.txt b/ydb/core/yq/libs/result_formatter/CMakeLists.linux-x86_64.txt
index c6f97efc7c..c6f97efc7c 100644
--- a/ydb/core/yq/libs/result_formatter/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/result_formatter/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/result_formatter/CMakeLists.txt b/ydb/core/yq/libs/result_formatter/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/result_formatter/CMakeLists.txt
+++ b/ydb/core/yq/libs/result_formatter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/result_formatter/ut/CMakeLists.darwin.txt b/ydb/core/yq/libs/result_formatter/ut/CMakeLists.darwin-x86_64.txt
index 8b6368ebf5..8b6368ebf5 100644
--- a/ydb/core/yq/libs/result_formatter/ut/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/result_formatter/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/result_formatter/ut/CMakeLists.linux.txt b/ydb/core/yq/libs/result_formatter/ut/CMakeLists.linux-x86_64.txt
index ace82c7d4e..ace82c7d4e 100644
--- a/ydb/core/yq/libs/result_formatter/ut/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/result_formatter/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/result_formatter/ut/CMakeLists.txt b/ydb/core/yq/libs/result_formatter/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/result_formatter/ut/CMakeLists.txt
+++ b/ydb/core/yq/libs/result_formatter/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/shared_resources/CMakeLists.darwin.txt b/ydb/core/yq/libs/shared_resources/CMakeLists.darwin-x86_64.txt
index a4e86e30e0..a4e86e30e0 100644
--- a/ydb/core/yq/libs/shared_resources/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/shared_resources/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/shared_resources/CMakeLists.linux.txt b/ydb/core/yq/libs/shared_resources/CMakeLists.linux-x86_64.txt
index 005c55de97..005c55de97 100644
--- a/ydb/core/yq/libs/shared_resources/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/shared_resources/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/shared_resources/CMakeLists.txt b/ydb/core/yq/libs/shared_resources/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/shared_resources/CMakeLists.txt
+++ b/ydb/core/yq/libs/shared_resources/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/shared_resources/interface/CMakeLists.darwin.txt b/ydb/core/yq/libs/shared_resources/interface/CMakeLists.darwin-x86_64.txt
index 60ba7bb876..60ba7bb876 100644
--- a/ydb/core/yq/libs/shared_resources/interface/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/shared_resources/interface/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/shared_resources/interface/CMakeLists.linux.txt b/ydb/core/yq/libs/shared_resources/interface/CMakeLists.linux-x86_64.txt
index cf38906da1..cf38906da1 100644
--- a/ydb/core/yq/libs/shared_resources/interface/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/shared_resources/interface/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/shared_resources/interface/CMakeLists.txt b/ydb/core/yq/libs/shared_resources/interface/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/shared_resources/interface/CMakeLists.txt
+++ b/ydb/core/yq/libs/shared_resources/interface/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/signer/CMakeLists.darwin.txt b/ydb/core/yq/libs/signer/CMakeLists.darwin-x86_64.txt
index 7d2b183979..7d2b183979 100644
--- a/ydb/core/yq/libs/signer/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/signer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/signer/CMakeLists.linux.txt b/ydb/core/yq/libs/signer/CMakeLists.linux-x86_64.txt
index 3192cd8d4c..3192cd8d4c 100644
--- a/ydb/core/yq/libs/signer/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/signer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/signer/CMakeLists.txt b/ydb/core/yq/libs/signer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/signer/CMakeLists.txt
+++ b/ydb/core/yq/libs/signer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/signer/ut/CMakeLists.darwin.txt b/ydb/core/yq/libs/signer/ut/CMakeLists.darwin-x86_64.txt
index 8b5aad8c8a..8b5aad8c8a 100644
--- a/ydb/core/yq/libs/signer/ut/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/signer/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/signer/ut/CMakeLists.linux.txt b/ydb/core/yq/libs/signer/ut/CMakeLists.linux-x86_64.txt
index a280999383..a280999383 100644
--- a/ydb/core/yq/libs/signer/ut/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/signer/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/signer/ut/CMakeLists.txt b/ydb/core/yq/libs/signer/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/signer/ut/CMakeLists.txt
+++ b/ydb/core/yq/libs/signer/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/tasks_packer/CMakeLists.darwin.txt b/ydb/core/yq/libs/tasks_packer/CMakeLists.darwin-x86_64.txt
index c1d1a3c30a..c1d1a3c30a 100644
--- a/ydb/core/yq/libs/tasks_packer/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/tasks_packer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/tasks_packer/CMakeLists.linux.txt b/ydb/core/yq/libs/tasks_packer/CMakeLists.linux-x86_64.txt
index d795eea3ab..d795eea3ab 100644
--- a/ydb/core/yq/libs/tasks_packer/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/tasks_packer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/tasks_packer/CMakeLists.txt b/ydb/core/yq/libs/tasks_packer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/tasks_packer/CMakeLists.txt
+++ b/ydb/core/yq/libs/tasks_packer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/test_connection/CMakeLists.darwin.txt b/ydb/core/yq/libs/test_connection/CMakeLists.darwin-x86_64.txt
index 75ea783ac8..75ea783ac8 100644
--- a/ydb/core/yq/libs/test_connection/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/test_connection/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/test_connection/CMakeLists.linux.txt b/ydb/core/yq/libs/test_connection/CMakeLists.linux-x86_64.txt
index 552e015705..552e015705 100644
--- a/ydb/core/yq/libs/test_connection/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/test_connection/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/test_connection/CMakeLists.txt b/ydb/core/yq/libs/test_connection/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/test_connection/CMakeLists.txt
+++ b/ydb/core/yq/libs/test_connection/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/test_connection/events/CMakeLists.darwin.txt b/ydb/core/yq/libs/test_connection/events/CMakeLists.darwin-x86_64.txt
index 014ee1370f..014ee1370f 100644
--- a/ydb/core/yq/libs/test_connection/events/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/test_connection/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/test_connection/events/CMakeLists.linux.txt b/ydb/core/yq/libs/test_connection/events/CMakeLists.linux-x86_64.txt
index 55f5c5f3f8..55f5c5f3f8 100644
--- a/ydb/core/yq/libs/test_connection/events/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/test_connection/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/test_connection/events/CMakeLists.txt b/ydb/core/yq/libs/test_connection/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/test_connection/events/CMakeLists.txt
+++ b/ydb/core/yq/libs/test_connection/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/test_connection/ut/CMakeLists.darwin.txt b/ydb/core/yq/libs/test_connection/ut/CMakeLists.darwin-x86_64.txt
index 913877e6fd..913877e6fd 100644
--- a/ydb/core/yq/libs/test_connection/ut/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/test_connection/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/test_connection/ut/CMakeLists.linux.txt b/ydb/core/yq/libs/test_connection/ut/CMakeLists.linux-x86_64.txt
index 55cf7f014f..55cf7f014f 100644
--- a/ydb/core/yq/libs/test_connection/ut/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/test_connection/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/test_connection/ut/CMakeLists.txt b/ydb/core/yq/libs/test_connection/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/test_connection/ut/CMakeLists.txt
+++ b/ydb/core/yq/libs/test_connection/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yq/libs/ydb/CMakeLists.darwin.txt b/ydb/core/yq/libs/ydb/CMakeLists.darwin-x86_64.txt
index 3a5a1723ba..3a5a1723ba 100644
--- a/ydb/core/yq/libs/ydb/CMakeLists.darwin.txt
+++ b/ydb/core/yq/libs/ydb/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yq/libs/ydb/CMakeLists.linux.txt b/ydb/core/yq/libs/ydb/CMakeLists.linux-x86_64.txt
index a37b3adfee..a37b3adfee 100644
--- a/ydb/core/yq/libs/ydb/CMakeLists.linux.txt
+++ b/ydb/core/yq/libs/ydb/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yq/libs/ydb/CMakeLists.txt b/ydb/core/yq/libs/ydb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yq/libs/ydb/CMakeLists.txt
+++ b/ydb/core/yq/libs/ydb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/core/yql_testlib/CMakeLists.darwin.txt b/ydb/core/yql_testlib/CMakeLists.darwin-x86_64.txt
index 71322b69cc..71322b69cc 100644
--- a/ydb/core/yql_testlib/CMakeLists.darwin.txt
+++ b/ydb/core/yql_testlib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/core/yql_testlib/CMakeLists.linux.txt b/ydb/core/yql_testlib/CMakeLists.linux-x86_64.txt
index 1eb240fd7b..1eb240fd7b 100644
--- a/ydb/core/yql_testlib/CMakeLists.linux.txt
+++ b/ydb/core/yql_testlib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/core/yql_testlib/CMakeLists.txt b/ydb/core/yql_testlib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/core/yql_testlib/CMakeLists.txt
+++ b/ydb/core/yql_testlib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/accessor/CMakeLists.darwin.txt b/ydb/library/accessor/CMakeLists.darwin-x86_64.txt
index c2a284076f..c2a284076f 100644
--- a/ydb/library/accessor/CMakeLists.darwin.txt
+++ b/ydb/library/accessor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/accessor/CMakeLists.linux.txt b/ydb/library/accessor/CMakeLists.linux-x86_64.txt
index d233360f6a..d233360f6a 100644
--- a/ydb/library/accessor/CMakeLists.linux.txt
+++ b/ydb/library/accessor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/accessor/CMakeLists.txt b/ydb/library/accessor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/accessor/CMakeLists.txt
+++ b/ydb/library/accessor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/aclib/CMakeLists.darwin.txt b/ydb/library/aclib/CMakeLists.darwin-x86_64.txt
index 336127fc26..336127fc26 100644
--- a/ydb/library/aclib/CMakeLists.darwin.txt
+++ b/ydb/library/aclib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/aclib/CMakeLists.linux.txt b/ydb/library/aclib/CMakeLists.linux-x86_64.txt
index 148291a94b..148291a94b 100644
--- a/ydb/library/aclib/CMakeLists.linux.txt
+++ b/ydb/library/aclib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/aclib/CMakeLists.txt b/ydb/library/aclib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/aclib/CMakeLists.txt
+++ b/ydb/library/aclib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/aclib/protos/CMakeLists.darwin.txt b/ydb/library/aclib/protos/CMakeLists.darwin-x86_64.txt
index d23f61eba4..d23f61eba4 100644
--- a/ydb/library/aclib/protos/CMakeLists.darwin.txt
+++ b/ydb/library/aclib/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/aclib/protos/CMakeLists.linux.txt b/ydb/library/aclib/protos/CMakeLists.linux-x86_64.txt
index 361dd69007..361dd69007 100644
--- a/ydb/library/aclib/protos/CMakeLists.linux.txt
+++ b/ydb/library/aclib/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/aclib/protos/CMakeLists.txt b/ydb/library/aclib/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/aclib/protos/CMakeLists.txt
+++ b/ydb/library/aclib/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/aclib/ut/CMakeLists.darwin.txt b/ydb/library/aclib/ut/CMakeLists.darwin-x86_64.txt
index ecd2ce5e72..ecd2ce5e72 100644
--- a/ydb/library/aclib/ut/CMakeLists.darwin.txt
+++ b/ydb/library/aclib/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/aclib/ut/CMakeLists.linux.txt b/ydb/library/aclib/ut/CMakeLists.linux-x86_64.txt
index cdcc7c5282..cdcc7c5282 100644
--- a/ydb/library/aclib/ut/CMakeLists.linux.txt
+++ b/ydb/library/aclib/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/aclib/ut/CMakeLists.txt b/ydb/library/aclib/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/aclib/ut/CMakeLists.txt
+++ b/ydb/library/aclib/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/arrow_clickhouse/CMakeLists.darwin.txt b/ydb/library/arrow_clickhouse/CMakeLists.darwin-x86_64.txt
index ad256049c8..ad256049c8 100644
--- a/ydb/library/arrow_clickhouse/CMakeLists.darwin.txt
+++ b/ydb/library/arrow_clickhouse/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/CMakeLists.linux.txt b/ydb/library/arrow_clickhouse/CMakeLists.linux-x86_64.txt
index 7da75a07c3..7da75a07c3 100644
--- a/ydb/library/arrow_clickhouse/CMakeLists.linux.txt
+++ b/ydb/library/arrow_clickhouse/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/CMakeLists.txt b/ydb/library/arrow_clickhouse/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/arrow_clickhouse/CMakeLists.txt
+++ b/ydb/library/arrow_clickhouse/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/arrow_clickhouse/Columns/CMakeLists.darwin.txt b/ydb/library/arrow_clickhouse/Columns/CMakeLists.darwin-x86_64.txt
index e8a9737df7..e8a9737df7 100644
--- a/ydb/library/arrow_clickhouse/Columns/CMakeLists.darwin.txt
+++ b/ydb/library/arrow_clickhouse/Columns/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/Columns/CMakeLists.linux.txt b/ydb/library/arrow_clickhouse/Columns/CMakeLists.linux-x86_64.txt
index a4ca991d19..a4ca991d19 100644
--- a/ydb/library/arrow_clickhouse/Columns/CMakeLists.linux.txt
+++ b/ydb/library/arrow_clickhouse/Columns/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/Columns/CMakeLists.txt b/ydb/library/arrow_clickhouse/Columns/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/arrow_clickhouse/Columns/CMakeLists.txt
+++ b/ydb/library/arrow_clickhouse/Columns/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/arrow_clickhouse/Common/CMakeLists.darwin.txt b/ydb/library/arrow_clickhouse/Common/CMakeLists.darwin-x86_64.txt
index 6b5b8c46f1..6b5b8c46f1 100644
--- a/ydb/library/arrow_clickhouse/Common/CMakeLists.darwin.txt
+++ b/ydb/library/arrow_clickhouse/Common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/Common/CMakeLists.linux.txt b/ydb/library/arrow_clickhouse/Common/CMakeLists.linux-x86_64.txt
index 4d1b5eb382..4d1b5eb382 100644
--- a/ydb/library/arrow_clickhouse/Common/CMakeLists.linux.txt
+++ b/ydb/library/arrow_clickhouse/Common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/Common/CMakeLists.txt b/ydb/library/arrow_clickhouse/Common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/arrow_clickhouse/Common/CMakeLists.txt
+++ b/ydb/library/arrow_clickhouse/Common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.darwin.txt b/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.darwin-x86_64.txt
index 503612c355..503612c355 100644
--- a/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.darwin.txt
+++ b/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.linux.txt b/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.linux-x86_64.txt
index 8198399840..8198399840 100644
--- a/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.linux.txt
+++ b/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.txt b/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.txt
+++ b/ydb/library/arrow_clickhouse/DataStreams/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/arrow_clickhouse/ut/CMakeLists.darwin.txt b/ydb/library/arrow_clickhouse/ut/CMakeLists.darwin-x86_64.txt
index 7c3aa4b9af..7c3aa4b9af 100644
--- a/ydb/library/arrow_clickhouse/ut/CMakeLists.darwin.txt
+++ b/ydb/library/arrow_clickhouse/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/ut/CMakeLists.linux.txt b/ydb/library/arrow_clickhouse/ut/CMakeLists.linux-x86_64.txt
index 1bf619469a..1bf619469a 100644
--- a/ydb/library/arrow_clickhouse/ut/CMakeLists.linux.txt
+++ b/ydb/library/arrow_clickhouse/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/arrow_clickhouse/ut/CMakeLists.txt b/ydb/library/arrow_clickhouse/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/arrow_clickhouse/ut/CMakeLists.txt
+++ b/ydb/library/arrow_clickhouse/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/arrow_kernels/CMakeLists.darwin.txt b/ydb/library/arrow_kernels/CMakeLists.darwin-x86_64.txt
index a6a7cff53e..a6a7cff53e 100644
--- a/ydb/library/arrow_kernels/CMakeLists.darwin.txt
+++ b/ydb/library/arrow_kernels/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/arrow_kernels/CMakeLists.linux.txt b/ydb/library/arrow_kernels/CMakeLists.linux-x86_64.txt
index a6f80d3e71..a6f80d3e71 100644
--- a/ydb/library/arrow_kernels/CMakeLists.linux.txt
+++ b/ydb/library/arrow_kernels/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/arrow_kernels/CMakeLists.txt b/ydb/library/arrow_kernels/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/arrow_kernels/CMakeLists.txt
+++ b/ydb/library/arrow_kernels/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/arrow_kernels/ut/CMakeLists.darwin.txt b/ydb/library/arrow_kernels/ut/CMakeLists.darwin-x86_64.txt
index 2ae5373c87..2ae5373c87 100644
--- a/ydb/library/arrow_kernels/ut/CMakeLists.darwin.txt
+++ b/ydb/library/arrow_kernels/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/arrow_kernels/ut/CMakeLists.linux.txt b/ydb/library/arrow_kernels/ut/CMakeLists.linux-x86_64.txt
index c789f051e2..c789f051e2 100644
--- a/ydb/library/arrow_kernels/ut/CMakeLists.linux.txt
+++ b/ydb/library/arrow_kernels/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/arrow_kernels/ut/CMakeLists.txt b/ydb/library/arrow_kernels/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/arrow_kernels/ut/CMakeLists.txt
+++ b/ydb/library/arrow_kernels/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/backup/CMakeLists.darwin.txt b/ydb/library/backup/CMakeLists.darwin-x86_64.txt
index 92a7c7975d..92a7c7975d 100644
--- a/ydb/library/backup/CMakeLists.darwin.txt
+++ b/ydb/library/backup/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/backup/CMakeLists.linux.txt b/ydb/library/backup/CMakeLists.linux-x86_64.txt
index 4c16eb983e..4c16eb983e 100644
--- a/ydb/library/backup/CMakeLists.linux.txt
+++ b/ydb/library/backup/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/backup/CMakeLists.txt b/ydb/library/backup/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/backup/CMakeLists.txt
+++ b/ydb/library/backup/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/backup/ut/CMakeLists.darwin.txt b/ydb/library/backup/ut/CMakeLists.darwin-x86_64.txt
index 7c35698014..7c35698014 100644
--- a/ydb/library/backup/ut/CMakeLists.darwin.txt
+++ b/ydb/library/backup/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/backup/ut/CMakeLists.linux.txt b/ydb/library/backup/ut/CMakeLists.linux-x86_64.txt
index b92b02ab73..b92b02ab73 100644
--- a/ydb/library/backup/ut/CMakeLists.linux.txt
+++ b/ydb/library/backup/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/backup/ut/CMakeLists.txt b/ydb/library/backup/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/backup/ut/CMakeLists.txt
+++ b/ydb/library/backup/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/binary_json/CMakeLists.darwin.txt b/ydb/library/binary_json/CMakeLists.darwin-x86_64.txt
index 59ac075d36..59ac075d36 100644
--- a/ydb/library/binary_json/CMakeLists.darwin.txt
+++ b/ydb/library/binary_json/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/binary_json/CMakeLists.linux.txt b/ydb/library/binary_json/CMakeLists.linux-x86_64.txt
index 7c1f6b8f86..7c1f6b8f86 100644
--- a/ydb/library/binary_json/CMakeLists.linux.txt
+++ b/ydb/library/binary_json/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/binary_json/CMakeLists.txt b/ydb/library/binary_json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/binary_json/CMakeLists.txt
+++ b/ydb/library/binary_json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/binary_json/ut/CMakeLists.darwin.txt b/ydb/library/binary_json/ut/CMakeLists.darwin-x86_64.txt
index 9715128f46..9715128f46 100644
--- a/ydb/library/binary_json/ut/CMakeLists.darwin.txt
+++ b/ydb/library/binary_json/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/binary_json/ut/CMakeLists.linux.txt b/ydb/library/binary_json/ut/CMakeLists.linux-x86_64.txt
index 031651c040..031651c040 100644
--- a/ydb/library/binary_json/ut/CMakeLists.linux.txt
+++ b/ydb/library/binary_json/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/binary_json/ut/CMakeLists.txt b/ydb/library/binary_json/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/binary_json/ut/CMakeLists.txt
+++ b/ydb/library/binary_json/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/db_pool/CMakeLists.darwin.txt b/ydb/library/db_pool/CMakeLists.darwin-x86_64.txt
index 6de7fc97e7..6de7fc97e7 100644
--- a/ydb/library/db_pool/CMakeLists.darwin.txt
+++ b/ydb/library/db_pool/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/db_pool/CMakeLists.linux.txt b/ydb/library/db_pool/CMakeLists.linux-x86_64.txt
index 596c5913b1..596c5913b1 100644
--- a/ydb/library/db_pool/CMakeLists.linux.txt
+++ b/ydb/library/db_pool/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/db_pool/CMakeLists.txt b/ydb/library/db_pool/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/db_pool/CMakeLists.txt
+++ b/ydb/library/db_pool/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/db_pool/protos/CMakeLists.darwin.txt b/ydb/library/db_pool/protos/CMakeLists.darwin-x86_64.txt
index b27a2ed4f7..b27a2ed4f7 100644
--- a/ydb/library/db_pool/protos/CMakeLists.darwin.txt
+++ b/ydb/library/db_pool/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/db_pool/protos/CMakeLists.linux.txt b/ydb/library/db_pool/protos/CMakeLists.linux-x86_64.txt
index d3afcddab9..d3afcddab9 100644
--- a/ydb/library/db_pool/protos/CMakeLists.linux.txt
+++ b/ydb/library/db_pool/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/db_pool/protos/CMakeLists.txt b/ydb/library/db_pool/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/db_pool/protos/CMakeLists.txt
+++ b/ydb/library/db_pool/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/dynumber/CMakeLists.darwin.txt b/ydb/library/dynumber/CMakeLists.darwin-x86_64.txt
index 8eba3e9ddc..8eba3e9ddc 100644
--- a/ydb/library/dynumber/CMakeLists.darwin.txt
+++ b/ydb/library/dynumber/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/dynumber/CMakeLists.linux.txt b/ydb/library/dynumber/CMakeLists.linux-x86_64.txt
index fe445ed486..fe445ed486 100644
--- a/ydb/library/dynumber/CMakeLists.linux.txt
+++ b/ydb/library/dynumber/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/dynumber/CMakeLists.txt b/ydb/library/dynumber/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/dynumber/CMakeLists.txt
+++ b/ydb/library/dynumber/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/dynumber/ut/CMakeLists.darwin.txt b/ydb/library/dynumber/ut/CMakeLists.darwin-x86_64.txt
index 3113f500f0..3113f500f0 100644
--- a/ydb/library/dynumber/ut/CMakeLists.darwin.txt
+++ b/ydb/library/dynumber/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/dynumber/ut/CMakeLists.linux.txt b/ydb/library/dynumber/ut/CMakeLists.linux-x86_64.txt
index 405bf5afe1..405bf5afe1 100644
--- a/ydb/library/dynumber/ut/CMakeLists.linux.txt
+++ b/ydb/library/dynumber/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/dynumber/ut/CMakeLists.txt b/ydb/library/dynumber/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/dynumber/ut/CMakeLists.txt
+++ b/ydb/library/dynumber/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/folder_service/CMakeLists.darwin.txt b/ydb/library/folder_service/CMakeLists.darwin-x86_64.txt
index bf310baa0d..bf310baa0d 100644
--- a/ydb/library/folder_service/CMakeLists.darwin.txt
+++ b/ydb/library/folder_service/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/folder_service/CMakeLists.linux.txt b/ydb/library/folder_service/CMakeLists.linux-x86_64.txt
index 974ec7f398..974ec7f398 100644
--- a/ydb/library/folder_service/CMakeLists.linux.txt
+++ b/ydb/library/folder_service/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/folder_service/CMakeLists.txt b/ydb/library/folder_service/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/folder_service/CMakeLists.txt
+++ b/ydb/library/folder_service/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/folder_service/mock/CMakeLists.darwin.txt b/ydb/library/folder_service/mock/CMakeLists.darwin-x86_64.txt
index 427fe81796..427fe81796 100644
--- a/ydb/library/folder_service/mock/CMakeLists.darwin.txt
+++ b/ydb/library/folder_service/mock/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/folder_service/mock/CMakeLists.linux.txt b/ydb/library/folder_service/mock/CMakeLists.linux-x86_64.txt
index bfbb6d839e..bfbb6d839e 100644
--- a/ydb/library/folder_service/mock/CMakeLists.linux.txt
+++ b/ydb/library/folder_service/mock/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/folder_service/mock/CMakeLists.txt b/ydb/library/folder_service/mock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/folder_service/mock/CMakeLists.txt
+++ b/ydb/library/folder_service/mock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/folder_service/proto/CMakeLists.darwin.txt b/ydb/library/folder_service/proto/CMakeLists.darwin-x86_64.txt
index bd40178fc1..bd40178fc1 100644
--- a/ydb/library/folder_service/proto/CMakeLists.darwin.txt
+++ b/ydb/library/folder_service/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/folder_service/proto/CMakeLists.linux.txt b/ydb/library/folder_service/proto/CMakeLists.linux-x86_64.txt
index 9b7472b986..9b7472b986 100644
--- a/ydb/library/folder_service/proto/CMakeLists.linux.txt
+++ b/ydb/library/folder_service/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/folder_service/proto/CMakeLists.txt b/ydb/library/folder_service/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/folder_service/proto/CMakeLists.txt
+++ b/ydb/library/folder_service/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/http_proxy/authorization/CMakeLists.darwin.txt b/ydb/library/http_proxy/authorization/CMakeLists.darwin-x86_64.txt
index ff67e93265..ff67e93265 100644
--- a/ydb/library/http_proxy/authorization/CMakeLists.darwin.txt
+++ b/ydb/library/http_proxy/authorization/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/http_proxy/authorization/CMakeLists.linux.txt b/ydb/library/http_proxy/authorization/CMakeLists.linux-x86_64.txt
index b3a387d8fc..b3a387d8fc 100644
--- a/ydb/library/http_proxy/authorization/CMakeLists.linux.txt
+++ b/ydb/library/http_proxy/authorization/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/http_proxy/authorization/CMakeLists.txt b/ydb/library/http_proxy/authorization/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/http_proxy/authorization/CMakeLists.txt
+++ b/ydb/library/http_proxy/authorization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/http_proxy/authorization/ut/CMakeLists.darwin.txt b/ydb/library/http_proxy/authorization/ut/CMakeLists.darwin-x86_64.txt
index 7dff6bb212..7dff6bb212 100644
--- a/ydb/library/http_proxy/authorization/ut/CMakeLists.darwin.txt
+++ b/ydb/library/http_proxy/authorization/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/http_proxy/authorization/ut/CMakeLists.linux.txt b/ydb/library/http_proxy/authorization/ut/CMakeLists.linux-x86_64.txt
index c5df04493b..c5df04493b 100644
--- a/ydb/library/http_proxy/authorization/ut/CMakeLists.linux.txt
+++ b/ydb/library/http_proxy/authorization/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/http_proxy/authorization/ut/CMakeLists.txt b/ydb/library/http_proxy/authorization/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/http_proxy/authorization/ut/CMakeLists.txt
+++ b/ydb/library/http_proxy/authorization/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/http_proxy/error/CMakeLists.darwin.txt b/ydb/library/http_proxy/error/CMakeLists.darwin-x86_64.txt
index b31069c69b..b31069c69b 100644
--- a/ydb/library/http_proxy/error/CMakeLists.darwin.txt
+++ b/ydb/library/http_proxy/error/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/http_proxy/error/CMakeLists.linux.txt b/ydb/library/http_proxy/error/CMakeLists.linux-x86_64.txt
index cac5423282..cac5423282 100644
--- a/ydb/library/http_proxy/error/CMakeLists.linux.txt
+++ b/ydb/library/http_proxy/error/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/http_proxy/error/CMakeLists.txt b/ydb/library/http_proxy/error/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/http_proxy/error/CMakeLists.txt
+++ b/ydb/library/http_proxy/error/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/keys/CMakeLists.darwin.txt b/ydb/library/keys/CMakeLists.darwin-x86_64.txt
index ae35a96ed5..ae35a96ed5 100644
--- a/ydb/library/keys/CMakeLists.darwin.txt
+++ b/ydb/library/keys/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/keys/CMakeLists.linux.txt b/ydb/library/keys/CMakeLists.linux-x86_64.txt
index ba7d1f19a9..ba7d1f19a9 100644
--- a/ydb/library/keys/CMakeLists.linux.txt
+++ b/ydb/library/keys/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/keys/CMakeLists.txt b/ydb/library/keys/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/keys/CMakeLists.txt
+++ b/ydb/library/keys/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/keys/ut/CMakeLists.darwin.txt b/ydb/library/keys/ut/CMakeLists.darwin-x86_64.txt
index 54c8c9ac1c..54c8c9ac1c 100644
--- a/ydb/library/keys/ut/CMakeLists.darwin.txt
+++ b/ydb/library/keys/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/keys/ut/CMakeLists.linux.txt b/ydb/library/keys/ut/CMakeLists.linux-x86_64.txt
index 35d9f20e49..35d9f20e49 100644
--- a/ydb/library/keys/ut/CMakeLists.linux.txt
+++ b/ydb/library/keys/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/keys/ut/CMakeLists.txt b/ydb/library/keys/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/keys/ut/CMakeLists.txt
+++ b/ydb/library/keys/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/logger/CMakeLists.darwin.txt b/ydb/library/logger/CMakeLists.darwin-x86_64.txt
index 102a906f0c..102a906f0c 100644
--- a/ydb/library/logger/CMakeLists.darwin.txt
+++ b/ydb/library/logger/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/logger/CMakeLists.linux.txt b/ydb/library/logger/CMakeLists.linux-x86_64.txt
index b16ca53920..b16ca53920 100644
--- a/ydb/library/logger/CMakeLists.linux.txt
+++ b/ydb/library/logger/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/logger/CMakeLists.txt b/ydb/library/logger/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/logger/CMakeLists.txt
+++ b/ydb/library/logger/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/login/CMakeLists.darwin.txt b/ydb/library/login/CMakeLists.darwin-x86_64.txt
index d9b859367b..d9b859367b 100644
--- a/ydb/library/login/CMakeLists.darwin.txt
+++ b/ydb/library/login/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/login/CMakeLists.linux.txt b/ydb/library/login/CMakeLists.linux-x86_64.txt
index e9f65247d2..e9f65247d2 100644
--- a/ydb/library/login/CMakeLists.linux.txt
+++ b/ydb/library/login/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/login/CMakeLists.txt b/ydb/library/login/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/login/CMakeLists.txt
+++ b/ydb/library/login/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/login/protos/CMakeLists.darwin.txt b/ydb/library/login/protos/CMakeLists.darwin-x86_64.txt
index bf877d4c78..bf877d4c78 100644
--- a/ydb/library/login/protos/CMakeLists.darwin.txt
+++ b/ydb/library/login/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/login/protos/CMakeLists.linux.txt b/ydb/library/login/protos/CMakeLists.linux-x86_64.txt
index 066ed1ab3a..066ed1ab3a 100644
--- a/ydb/library/login/protos/CMakeLists.linux.txt
+++ b/ydb/library/login/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/login/protos/CMakeLists.txt b/ydb/library/login/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/login/protos/CMakeLists.txt
+++ b/ydb/library/login/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/login/ut/CMakeLists.darwin.txt b/ydb/library/login/ut/CMakeLists.darwin-x86_64.txt
index 7218378b8b..7218378b8b 100644
--- a/ydb/library/login/ut/CMakeLists.darwin.txt
+++ b/ydb/library/login/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/login/ut/CMakeLists.linux.txt b/ydb/library/login/ut/CMakeLists.linux-x86_64.txt
index b7984d89be..b7984d89be 100644
--- a/ydb/library/login/ut/CMakeLists.linux.txt
+++ b/ydb/library/login/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/login/ut/CMakeLists.txt b/ydb/library/login/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/login/ut/CMakeLists.txt
+++ b/ydb/library/login/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/mkql_proto/CMakeLists.darwin.txt b/ydb/library/mkql_proto/CMakeLists.darwin-x86_64.txt
index 100a360532..100a360532 100644
--- a/ydb/library/mkql_proto/CMakeLists.darwin.txt
+++ b/ydb/library/mkql_proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/mkql_proto/CMakeLists.linux.txt b/ydb/library/mkql_proto/CMakeLists.linux-x86_64.txt
index ffe27cc8f9..ffe27cc8f9 100644
--- a/ydb/library/mkql_proto/CMakeLists.linux.txt
+++ b/ydb/library/mkql_proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/mkql_proto/CMakeLists.txt b/ydb/library/mkql_proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/mkql_proto/CMakeLists.txt
+++ b/ydb/library/mkql_proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/mkql_proto/protos/CMakeLists.darwin.txt b/ydb/library/mkql_proto/protos/CMakeLists.darwin-x86_64.txt
index 68671e8b39..68671e8b39 100644
--- a/ydb/library/mkql_proto/protos/CMakeLists.darwin.txt
+++ b/ydb/library/mkql_proto/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/mkql_proto/protos/CMakeLists.linux.txt b/ydb/library/mkql_proto/protos/CMakeLists.linux-x86_64.txt
index 4ba81eed8a..4ba81eed8a 100644
--- a/ydb/library/mkql_proto/protos/CMakeLists.linux.txt
+++ b/ydb/library/mkql_proto/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/mkql_proto/protos/CMakeLists.txt b/ydb/library/mkql_proto/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/mkql_proto/protos/CMakeLists.txt
+++ b/ydb/library/mkql_proto/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/mkql_proto/ut/CMakeLists.darwin.txt b/ydb/library/mkql_proto/ut/CMakeLists.darwin-x86_64.txt
index 64eb88ec04..64eb88ec04 100644
--- a/ydb/library/mkql_proto/ut/CMakeLists.darwin.txt
+++ b/ydb/library/mkql_proto/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/mkql_proto/ut/CMakeLists.linux.txt b/ydb/library/mkql_proto/ut/CMakeLists.linux-x86_64.txt
index 3a69c1f2d0..3a69c1f2d0 100644
--- a/ydb/library/mkql_proto/ut/CMakeLists.linux.txt
+++ b/ydb/library/mkql_proto/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/mkql_proto/ut/CMakeLists.txt b/ydb/library/mkql_proto/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/mkql_proto/ut/CMakeLists.txt
+++ b/ydb/library/mkql_proto/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/mkql_proto/ut/helpers/CMakeLists.darwin.txt b/ydb/library/mkql_proto/ut/helpers/CMakeLists.darwin-x86_64.txt
index 6e37268a1f..6e37268a1f 100644
--- a/ydb/library/mkql_proto/ut/helpers/CMakeLists.darwin.txt
+++ b/ydb/library/mkql_proto/ut/helpers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/mkql_proto/ut/helpers/CMakeLists.linux.txt b/ydb/library/mkql_proto/ut/helpers/CMakeLists.linux-x86_64.txt
index aa8aaa3ccb..aa8aaa3ccb 100644
--- a/ydb/library/mkql_proto/ut/helpers/CMakeLists.linux.txt
+++ b/ydb/library/mkql_proto/ut/helpers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/mkql_proto/ut/helpers/CMakeLists.txt b/ydb/library/mkql_proto/ut/helpers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/mkql_proto/ut/helpers/CMakeLists.txt
+++ b/ydb/library/mkql_proto/ut/helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/naming_conventions/CMakeLists.darwin.txt b/ydb/library/naming_conventions/CMakeLists.darwin-x86_64.txt
index f3fd1057c3..f3fd1057c3 100644
--- a/ydb/library/naming_conventions/CMakeLists.darwin.txt
+++ b/ydb/library/naming_conventions/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/naming_conventions/CMakeLists.linux.txt b/ydb/library/naming_conventions/CMakeLists.linux-x86_64.txt
index fa07869250..fa07869250 100644
--- a/ydb/library/naming_conventions/CMakeLists.linux.txt
+++ b/ydb/library/naming_conventions/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/naming_conventions/CMakeLists.txt b/ydb/library/naming_conventions/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/naming_conventions/CMakeLists.txt
+++ b/ydb/library/naming_conventions/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/naming_conventions/ut/CMakeLists.darwin.txt b/ydb/library/naming_conventions/ut/CMakeLists.darwin-x86_64.txt
index 0223b09882..0223b09882 100644
--- a/ydb/library/naming_conventions/ut/CMakeLists.darwin.txt
+++ b/ydb/library/naming_conventions/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/naming_conventions/ut/CMakeLists.linux.txt b/ydb/library/naming_conventions/ut/CMakeLists.linux-x86_64.txt
index 4593b225cd..4593b225cd 100644
--- a/ydb/library/naming_conventions/ut/CMakeLists.linux.txt
+++ b/ydb/library/naming_conventions/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/naming_conventions/ut/CMakeLists.txt b/ydb/library/naming_conventions/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/naming_conventions/ut/CMakeLists.txt
+++ b/ydb/library/naming_conventions/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/pdisk_io/CMakeLists.darwin.txt b/ydb/library/pdisk_io/CMakeLists.darwin-x86_64.txt
index 741986c861..741986c861 100644
--- a/ydb/library/pdisk_io/CMakeLists.darwin.txt
+++ b/ydb/library/pdisk_io/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/pdisk_io/CMakeLists.linux.txt b/ydb/library/pdisk_io/CMakeLists.linux-x86_64.txt
index 812cc92621..812cc92621 100644
--- a/ydb/library/pdisk_io/CMakeLists.linux.txt
+++ b/ydb/library/pdisk_io/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/pdisk_io/CMakeLists.txt b/ydb/library/pdisk_io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/pdisk_io/CMakeLists.txt
+++ b/ydb/library/pdisk_io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/pdisk_io/protos/CMakeLists.darwin.txt b/ydb/library/pdisk_io/protos/CMakeLists.darwin-x86_64.txt
index ffdbd27bec..ffdbd27bec 100644
--- a/ydb/library/pdisk_io/protos/CMakeLists.darwin.txt
+++ b/ydb/library/pdisk_io/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/pdisk_io/protos/CMakeLists.linux.txt b/ydb/library/pdisk_io/protos/CMakeLists.linux-x86_64.txt
index 725db4dd9a..725db4dd9a 100644
--- a/ydb/library/pdisk_io/protos/CMakeLists.linux.txt
+++ b/ydb/library/pdisk_io/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/pdisk_io/protos/CMakeLists.txt b/ydb/library/pdisk_io/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/pdisk_io/protos/CMakeLists.txt
+++ b/ydb/library/pdisk_io/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/persqueue/counter_time_keeper/CMakeLists.darwin.txt b/ydb/library/persqueue/counter_time_keeper/CMakeLists.darwin-x86_64.txt
index e272674974..e272674974 100644
--- a/ydb/library/persqueue/counter_time_keeper/CMakeLists.darwin.txt
+++ b/ydb/library/persqueue/counter_time_keeper/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/persqueue/counter_time_keeper/CMakeLists.linux.txt b/ydb/library/persqueue/counter_time_keeper/CMakeLists.linux-x86_64.txt
index 49840f54b8..49840f54b8 100644
--- a/ydb/library/persqueue/counter_time_keeper/CMakeLists.linux.txt
+++ b/ydb/library/persqueue/counter_time_keeper/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/persqueue/counter_time_keeper/CMakeLists.txt b/ydb/library/persqueue/counter_time_keeper/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/persqueue/counter_time_keeper/CMakeLists.txt
+++ b/ydb/library/persqueue/counter_time_keeper/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/persqueue/obfuscate/CMakeLists.darwin.txt b/ydb/library/persqueue/obfuscate/CMakeLists.darwin-x86_64.txt
index 02f21933a9..02f21933a9 100644
--- a/ydb/library/persqueue/obfuscate/CMakeLists.darwin.txt
+++ b/ydb/library/persqueue/obfuscate/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/persqueue/obfuscate/CMakeLists.linux.txt b/ydb/library/persqueue/obfuscate/CMakeLists.linux-x86_64.txt
index 9b03ab9bc5..9b03ab9bc5 100644
--- a/ydb/library/persqueue/obfuscate/CMakeLists.linux.txt
+++ b/ydb/library/persqueue/obfuscate/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/persqueue/obfuscate/CMakeLists.txt b/ydb/library/persqueue/obfuscate/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/persqueue/obfuscate/CMakeLists.txt
+++ b/ydb/library/persqueue/obfuscate/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/persqueue/tests/CMakeLists.darwin.txt b/ydb/library/persqueue/tests/CMakeLists.darwin-x86_64.txt
index 3cfa9f24f7..3cfa9f24f7 100644
--- a/ydb/library/persqueue/tests/CMakeLists.darwin.txt
+++ b/ydb/library/persqueue/tests/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/persqueue/tests/CMakeLists.linux.txt b/ydb/library/persqueue/tests/CMakeLists.linux-x86_64.txt
index 6071fc4902..6071fc4902 100644
--- a/ydb/library/persqueue/tests/CMakeLists.linux.txt
+++ b/ydb/library/persqueue/tests/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/persqueue/tests/CMakeLists.txt b/ydb/library/persqueue/tests/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/persqueue/tests/CMakeLists.txt
+++ b/ydb/library/persqueue/tests/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/persqueue/topic_parser/CMakeLists.darwin.txt b/ydb/library/persqueue/topic_parser/CMakeLists.darwin-x86_64.txt
index b53684c776..b53684c776 100644
--- a/ydb/library/persqueue/topic_parser/CMakeLists.darwin.txt
+++ b/ydb/library/persqueue/topic_parser/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/persqueue/topic_parser/CMakeLists.linux.txt b/ydb/library/persqueue/topic_parser/CMakeLists.linux-x86_64.txt
index 337eb74e3b..337eb74e3b 100644
--- a/ydb/library/persqueue/topic_parser/CMakeLists.linux.txt
+++ b/ydb/library/persqueue/topic_parser/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/persqueue/topic_parser/CMakeLists.txt b/ydb/library/persqueue/topic_parser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/persqueue/topic_parser/CMakeLists.txt
+++ b/ydb/library/persqueue/topic_parser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/persqueue/topic_parser/ut/CMakeLists.darwin.txt b/ydb/library/persqueue/topic_parser/ut/CMakeLists.darwin-x86_64.txt
index 225ea55cc3..225ea55cc3 100644
--- a/ydb/library/persqueue/topic_parser/ut/CMakeLists.darwin.txt
+++ b/ydb/library/persqueue/topic_parser/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/persqueue/topic_parser/ut/CMakeLists.linux.txt b/ydb/library/persqueue/topic_parser/ut/CMakeLists.linux-x86_64.txt
index 2f65a3a937..2f65a3a937 100644
--- a/ydb/library/persqueue/topic_parser/ut/CMakeLists.linux.txt
+++ b/ydb/library/persqueue/topic_parser/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/persqueue/topic_parser/ut/CMakeLists.txt b/ydb/library/persqueue/topic_parser/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/persqueue/topic_parser/ut/CMakeLists.txt
+++ b/ydb/library/persqueue/topic_parser/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/persqueue/topic_parser_public/CMakeLists.darwin.txt b/ydb/library/persqueue/topic_parser_public/CMakeLists.darwin-x86_64.txt
index b6e8e1156a..b6e8e1156a 100644
--- a/ydb/library/persqueue/topic_parser_public/CMakeLists.darwin.txt
+++ b/ydb/library/persqueue/topic_parser_public/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/persqueue/topic_parser_public/CMakeLists.linux.txt b/ydb/library/persqueue/topic_parser_public/CMakeLists.linux-x86_64.txt
index 851cc42268..851cc42268 100644
--- a/ydb/library/persqueue/topic_parser_public/CMakeLists.linux.txt
+++ b/ydb/library/persqueue/topic_parser_public/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/persqueue/topic_parser_public/CMakeLists.txt b/ydb/library/persqueue/topic_parser_public/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/persqueue/topic_parser_public/CMakeLists.txt
+++ b/ydb/library/persqueue/topic_parser_public/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/pretty_types_print/protobuf/CMakeLists.darwin.txt b/ydb/library/pretty_types_print/protobuf/CMakeLists.darwin-x86_64.txt
index 0d9b3abdd2..0d9b3abdd2 100644
--- a/ydb/library/pretty_types_print/protobuf/CMakeLists.darwin.txt
+++ b/ydb/library/pretty_types_print/protobuf/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/pretty_types_print/protobuf/CMakeLists.linux.txt b/ydb/library/pretty_types_print/protobuf/CMakeLists.linux-x86_64.txt
index a1bba8a837..a1bba8a837 100644
--- a/ydb/library/pretty_types_print/protobuf/CMakeLists.linux.txt
+++ b/ydb/library/pretty_types_print/protobuf/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/pretty_types_print/protobuf/CMakeLists.txt b/ydb/library/pretty_types_print/protobuf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/pretty_types_print/protobuf/CMakeLists.txt
+++ b/ydb/library/pretty_types_print/protobuf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/pretty_types_print/wilson/CMakeLists.darwin.txt b/ydb/library/pretty_types_print/wilson/CMakeLists.darwin-x86_64.txt
index 6928b07809..6928b07809 100644
--- a/ydb/library/pretty_types_print/wilson/CMakeLists.darwin.txt
+++ b/ydb/library/pretty_types_print/wilson/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/pretty_types_print/wilson/CMakeLists.linux.txt b/ydb/library/pretty_types_print/wilson/CMakeLists.linux-x86_64.txt
index c216b8801e..c216b8801e 100644
--- a/ydb/library/pretty_types_print/wilson/CMakeLists.linux.txt
+++ b/ydb/library/pretty_types_print/wilson/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/pretty_types_print/wilson/CMakeLists.txt b/ydb/library/pretty_types_print/wilson/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/pretty_types_print/wilson/CMakeLists.txt
+++ b/ydb/library/pretty_types_print/wilson/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/protobuf_printer/CMakeLists.darwin.txt b/ydb/library/protobuf_printer/CMakeLists.darwin-x86_64.txt
index 6819133278..6819133278 100644
--- a/ydb/library/protobuf_printer/CMakeLists.darwin.txt
+++ b/ydb/library/protobuf_printer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/protobuf_printer/CMakeLists.linux.txt b/ydb/library/protobuf_printer/CMakeLists.linux-x86_64.txt
index 4d1c6ede16..4d1c6ede16 100644
--- a/ydb/library/protobuf_printer/CMakeLists.linux.txt
+++ b/ydb/library/protobuf_printer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/protobuf_printer/CMakeLists.txt b/ydb/library/protobuf_printer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/protobuf_printer/CMakeLists.txt
+++ b/ydb/library/protobuf_printer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/protobuf_printer/ut/CMakeLists.darwin.txt b/ydb/library/protobuf_printer/ut/CMakeLists.darwin-x86_64.txt
index ea224594c0..ea224594c0 100644
--- a/ydb/library/protobuf_printer/ut/CMakeLists.darwin.txt
+++ b/ydb/library/protobuf_printer/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/protobuf_printer/ut/CMakeLists.linux.txt b/ydb/library/protobuf_printer/ut/CMakeLists.linux-x86_64.txt
index 69d832ded0..69d832ded0 100644
--- a/ydb/library/protobuf_printer/ut/CMakeLists.linux.txt
+++ b/ydb/library/protobuf_printer/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/protobuf_printer/ut/CMakeLists.txt b/ydb/library/protobuf_printer/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/protobuf_printer/ut/CMakeLists.txt
+++ b/ydb/library/protobuf_printer/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/rewrapper/CMakeLists.darwin.txt b/ydb/library/rewrapper/CMakeLists.darwin-x86_64.txt
index 25872ed43b..25872ed43b 100644
--- a/ydb/library/rewrapper/CMakeLists.darwin.txt
+++ b/ydb/library/rewrapper/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/rewrapper/CMakeLists.linux.txt b/ydb/library/rewrapper/CMakeLists.linux-x86_64.txt
index de0b597067..de0b597067 100644
--- a/ydb/library/rewrapper/CMakeLists.linux.txt
+++ b/ydb/library/rewrapper/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/rewrapper/CMakeLists.txt b/ydb/library/rewrapper/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/rewrapper/CMakeLists.txt
+++ b/ydb/library/rewrapper/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/rewrapper/hyperscan/CMakeLists.darwin.txt b/ydb/library/rewrapper/hyperscan/CMakeLists.darwin-x86_64.txt
index baa8fceadb..baa8fceadb 100644
--- a/ydb/library/rewrapper/hyperscan/CMakeLists.darwin.txt
+++ b/ydb/library/rewrapper/hyperscan/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/rewrapper/hyperscan/CMakeLists.linux.txt b/ydb/library/rewrapper/hyperscan/CMakeLists.linux-x86_64.txt
index 72e1682b66..72e1682b66 100644
--- a/ydb/library/rewrapper/hyperscan/CMakeLists.linux.txt
+++ b/ydb/library/rewrapper/hyperscan/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/rewrapper/hyperscan/CMakeLists.txt b/ydb/library/rewrapper/hyperscan/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/ydb/library/rewrapper/hyperscan/CMakeLists.txt
+++ b/ydb/library/rewrapper/hyperscan/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/rewrapper/proto/CMakeLists.darwin.txt b/ydb/library/rewrapper/proto/CMakeLists.darwin-x86_64.txt
index 118580ff4c..118580ff4c 100644
--- a/ydb/library/rewrapper/proto/CMakeLists.darwin.txt
+++ b/ydb/library/rewrapper/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/rewrapper/proto/CMakeLists.linux.txt b/ydb/library/rewrapper/proto/CMakeLists.linux-x86_64.txt
index 0bfb5e5684..0bfb5e5684 100644
--- a/ydb/library/rewrapper/proto/CMakeLists.linux.txt
+++ b/ydb/library/rewrapper/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/rewrapper/proto/CMakeLists.txt b/ydb/library/rewrapper/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/rewrapper/proto/CMakeLists.txt
+++ b/ydb/library/rewrapper/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/rewrapper/re2/CMakeLists.darwin.txt b/ydb/library/rewrapper/re2/CMakeLists.darwin-x86_64.txt
index a021b4859b..a021b4859b 100644
--- a/ydb/library/rewrapper/re2/CMakeLists.darwin.txt
+++ b/ydb/library/rewrapper/re2/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/rewrapper/re2/CMakeLists.linux.txt b/ydb/library/rewrapper/re2/CMakeLists.linux-x86_64.txt
index 6763195f0d..6763195f0d 100644
--- a/ydb/library/rewrapper/re2/CMakeLists.linux.txt
+++ b/ydb/library/rewrapper/re2/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/rewrapper/re2/CMakeLists.txt b/ydb/library/rewrapper/re2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/rewrapper/re2/CMakeLists.txt
+++ b/ydb/library/rewrapper/re2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/CMakeLists.darwin.txt b/ydb/library/schlab/CMakeLists.darwin-x86_64.txt
index 35b5487e79..35b5487e79 100644
--- a/ydb/library/schlab/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/CMakeLists.linux.txt b/ydb/library/schlab/CMakeLists.linux-x86_64.txt
index 4ce9056fc0..4ce9056fc0 100644
--- a/ydb/library/schlab/CMakeLists.linux.txt
+++ b/ydb/library/schlab/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/CMakeLists.txt b/ydb/library/schlab/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/CMakeLists.txt
+++ b/ydb/library/schlab/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/mon/CMakeLists.darwin.txt b/ydb/library/schlab/mon/CMakeLists.darwin-x86_64.txt
index f0f4699c55..f0f4699c55 100644
--- a/ydb/library/schlab/mon/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/mon/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/mon/CMakeLists.linux.txt b/ydb/library/schlab/mon/CMakeLists.linux-x86_64.txt
index a740b64457..a740b64457 100644
--- a/ydb/library/schlab/mon/CMakeLists.linux.txt
+++ b/ydb/library/schlab/mon/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/mon/CMakeLists.txt b/ydb/library/schlab/mon/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/mon/CMakeLists.txt
+++ b/ydb/library/schlab/mon/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/mon/static/CMakeLists.darwin.txt b/ydb/library/schlab/mon/static/CMakeLists.darwin-x86_64.txt
index 382b5085cd..382b5085cd 100644
--- a/ydb/library/schlab/mon/static/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/mon/static/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/mon/static/CMakeLists.linux.txt b/ydb/library/schlab/mon/static/CMakeLists.linux-x86_64.txt
index 5f442af9f2..5f442af9f2 100644
--- a/ydb/library/schlab/mon/static/CMakeLists.linux.txt
+++ b/ydb/library/schlab/mon/static/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/mon/static/CMakeLists.txt b/ydb/library/schlab/mon/static/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/mon/static/CMakeLists.txt
+++ b/ydb/library/schlab/mon/static/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/mon/static/css/CMakeLists.darwin.txt b/ydb/library/schlab/mon/static/css/CMakeLists.darwin-x86_64.txt
index d722e0e466..d722e0e466 100644
--- a/ydb/library/schlab/mon/static/css/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/mon/static/css/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/mon/static/css/CMakeLists.linux.txt b/ydb/library/schlab/mon/static/css/CMakeLists.linux-x86_64.txt
index 2c8b78a748..2c8b78a748 100644
--- a/ydb/library/schlab/mon/static/css/CMakeLists.linux.txt
+++ b/ydb/library/schlab/mon/static/css/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/mon/static/css/CMakeLists.txt b/ydb/library/schlab/mon/static/css/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/mon/static/css/CMakeLists.txt
+++ b/ydb/library/schlab/mon/static/css/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/mon/static/js/CMakeLists.darwin.txt b/ydb/library/schlab/mon/static/js/CMakeLists.darwin-x86_64.txt
index 0369922dd0..0369922dd0 100644
--- a/ydb/library/schlab/mon/static/js/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/mon/static/js/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/mon/static/js/CMakeLists.linux.txt b/ydb/library/schlab/mon/static/js/CMakeLists.linux-x86_64.txt
index f5b55e898b..f5b55e898b 100644
--- a/ydb/library/schlab/mon/static/js/CMakeLists.linux.txt
+++ b/ydb/library/schlab/mon/static/js/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/mon/static/js/CMakeLists.txt b/ydb/library/schlab/mon/static/js/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/mon/static/js/CMakeLists.txt
+++ b/ydb/library/schlab/mon/static/js/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/mon/test/CMakeLists.darwin.txt b/ydb/library/schlab/mon/test/CMakeLists.darwin-x86_64.txt
index 064ae015db..064ae015db 100644
--- a/ydb/library/schlab/mon/test/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/mon/test/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/mon/test/CMakeLists.linux.txt b/ydb/library/schlab/mon/test/CMakeLists.linux-x86_64.txt
index 8ebaa5c911..8ebaa5c911 100644
--- a/ydb/library/schlab/mon/test/CMakeLists.linux.txt
+++ b/ydb/library/schlab/mon/test/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/mon/test/CMakeLists.txt b/ydb/library/schlab/mon/test/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/mon/test/CMakeLists.txt
+++ b/ydb/library/schlab/mon/test/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/probes/CMakeLists.darwin.txt b/ydb/library/schlab/probes/CMakeLists.darwin-x86_64.txt
index 357d4c0baf..357d4c0baf 100644
--- a/ydb/library/schlab/probes/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/probes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/probes/CMakeLists.linux.txt b/ydb/library/schlab/probes/CMakeLists.linux-x86_64.txt
index ef987e0506..ef987e0506 100644
--- a/ydb/library/schlab/probes/CMakeLists.linux.txt
+++ b/ydb/library/schlab/probes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/probes/CMakeLists.txt b/ydb/library/schlab/probes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/probes/CMakeLists.txt
+++ b/ydb/library/schlab/probes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/protos/CMakeLists.darwin.txt b/ydb/library/schlab/protos/CMakeLists.darwin-x86_64.txt
index 8e9addba13..8e9addba13 100644
--- a/ydb/library/schlab/protos/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/protos/CMakeLists.linux.txt b/ydb/library/schlab/protos/CMakeLists.linux-x86_64.txt
index 0523a3a5a8..0523a3a5a8 100644
--- a/ydb/library/schlab/protos/CMakeLists.linux.txt
+++ b/ydb/library/schlab/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/protos/CMakeLists.txt b/ydb/library/schlab/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/protos/CMakeLists.txt
+++ b/ydb/library/schlab/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/schemu/CMakeLists.darwin.txt b/ydb/library/schlab/schemu/CMakeLists.darwin-x86_64.txt
index 007223c328..007223c328 100644
--- a/ydb/library/schlab/schemu/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/schemu/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/schemu/CMakeLists.linux.txt b/ydb/library/schlab/schemu/CMakeLists.linux-x86_64.txt
index ef80cbd3ea..ef80cbd3ea 100644
--- a/ydb/library/schlab/schemu/CMakeLists.linux.txt
+++ b/ydb/library/schlab/schemu/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/schemu/CMakeLists.txt b/ydb/library/schlab/schemu/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/schemu/CMakeLists.txt
+++ b/ydb/library/schlab/schemu/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/schine/CMakeLists.darwin.txt b/ydb/library/schlab/schine/CMakeLists.darwin-x86_64.txt
index 9ab206f785..9ab206f785 100644
--- a/ydb/library/schlab/schine/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/schine/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/schine/CMakeLists.linux.txt b/ydb/library/schlab/schine/CMakeLists.linux-x86_64.txt
index cf733641cc..cf733641cc 100644
--- a/ydb/library/schlab/schine/CMakeLists.linux.txt
+++ b/ydb/library/schlab/schine/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/schine/CMakeLists.txt b/ydb/library/schlab/schine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/schine/CMakeLists.txt
+++ b/ydb/library/schlab/schine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/schoot/CMakeLists.darwin.txt b/ydb/library/schlab/schoot/CMakeLists.darwin-x86_64.txt
index f4ef52b638..f4ef52b638 100644
--- a/ydb/library/schlab/schoot/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/schoot/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/schoot/CMakeLists.linux.txt b/ydb/library/schlab/schoot/CMakeLists.linux-x86_64.txt
index 91952ef4ad..91952ef4ad 100644
--- a/ydb/library/schlab/schoot/CMakeLists.linux.txt
+++ b/ydb/library/schlab/schoot/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/schoot/CMakeLists.txt b/ydb/library/schlab/schoot/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/schoot/CMakeLists.txt
+++ b/ydb/library/schlab/schoot/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/schlab/ut/CMakeLists.darwin.txt b/ydb/library/schlab/ut/CMakeLists.darwin-x86_64.txt
index ccf8716a47..ccf8716a47 100644
--- a/ydb/library/schlab/ut/CMakeLists.darwin.txt
+++ b/ydb/library/schlab/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/schlab/ut/CMakeLists.linux.txt b/ydb/library/schlab/ut/CMakeLists.linux-x86_64.txt
index 515cb8471d..515cb8471d 100644
--- a/ydb/library/schlab/ut/CMakeLists.linux.txt
+++ b/ydb/library/schlab/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/schlab/ut/CMakeLists.txt b/ydb/library/schlab/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/schlab/ut/CMakeLists.txt
+++ b/ydb/library/schlab/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/security/CMakeLists.darwin.txt b/ydb/library/security/CMakeLists.darwin-x86_64.txt
index 70ee437a1e..70ee437a1e 100644
--- a/ydb/library/security/CMakeLists.darwin.txt
+++ b/ydb/library/security/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/security/CMakeLists.linux.txt b/ydb/library/security/CMakeLists.linux-x86_64.txt
index bcf6139d20..bcf6139d20 100644
--- a/ydb/library/security/CMakeLists.linux.txt
+++ b/ydb/library/security/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/security/CMakeLists.txt b/ydb/library/security/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/security/CMakeLists.txt
+++ b/ydb/library/security/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/security/ut/CMakeLists.darwin.txt b/ydb/library/security/ut/CMakeLists.darwin-x86_64.txt
index a4a971ab59..a4a971ab59 100644
--- a/ydb/library/security/ut/CMakeLists.darwin.txt
+++ b/ydb/library/security/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/security/ut/CMakeLists.linux.txt b/ydb/library/security/ut/CMakeLists.linux-x86_64.txt
index a8a67fdae4..a8a67fdae4 100644
--- a/ydb/library/security/ut/CMakeLists.linux.txt
+++ b/ydb/library/security/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/security/ut/CMakeLists.txt b/ydb/library/security/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/security/ut/CMakeLists.txt
+++ b/ydb/library/security/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/testlib/service_mocks/CMakeLists.darwin.txt b/ydb/library/testlib/service_mocks/CMakeLists.darwin-x86_64.txt
index 6f9f52f430..6f9f52f430 100644
--- a/ydb/library/testlib/service_mocks/CMakeLists.darwin.txt
+++ b/ydb/library/testlib/service_mocks/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/testlib/service_mocks/CMakeLists.linux.txt b/ydb/library/testlib/service_mocks/CMakeLists.linux-x86_64.txt
index 963c3eb248..963c3eb248 100644
--- a/ydb/library/testlib/service_mocks/CMakeLists.linux.txt
+++ b/ydb/library/testlib/service_mocks/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/testlib/service_mocks/CMakeLists.txt b/ydb/library/testlib/service_mocks/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/testlib/service_mocks/CMakeLists.txt
+++ b/ydb/library/testlib/service_mocks/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/uuid/CMakeLists.darwin.txt b/ydb/library/uuid/CMakeLists.darwin-x86_64.txt
index 56baf081bb..56baf081bb 100644
--- a/ydb/library/uuid/CMakeLists.darwin.txt
+++ b/ydb/library/uuid/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/uuid/CMakeLists.linux.txt b/ydb/library/uuid/CMakeLists.linux-x86_64.txt
index 09fed5adf9..09fed5adf9 100644
--- a/ydb/library/uuid/CMakeLists.linux.txt
+++ b/ydb/library/uuid/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/uuid/CMakeLists.txt b/ydb/library/uuid/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/uuid/CMakeLists.txt
+++ b/ydb/library/uuid/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/workload/CMakeLists.darwin.txt b/ydb/library/workload/CMakeLists.darwin-x86_64.txt
index 948585439c..948585439c 100644
--- a/ydb/library/workload/CMakeLists.darwin.txt
+++ b/ydb/library/workload/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/workload/CMakeLists.linux.txt b/ydb/library/workload/CMakeLists.linux-x86_64.txt
index ca62ddeed5..ca62ddeed5 100644
--- a/ydb/library/workload/CMakeLists.linux.txt
+++ b/ydb/library/workload/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/workload/CMakeLists.txt b/ydb/library/workload/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/workload/CMakeLists.txt
+++ b/ydb/library/workload/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yaml_config/CMakeLists.darwin.txt b/ydb/library/yaml_config/CMakeLists.darwin-x86_64.txt
index aea1570e3f..aea1570e3f 100644
--- a/ydb/library/yaml_config/CMakeLists.darwin.txt
+++ b/ydb/library/yaml_config/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yaml_config/CMakeLists.linux.txt b/ydb/library/yaml_config/CMakeLists.linux-x86_64.txt
index 92b839a424..92b839a424 100644
--- a/ydb/library/yaml_config/CMakeLists.linux.txt
+++ b/ydb/library/yaml_config/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yaml_config/CMakeLists.txt b/ydb/library/yaml_config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yaml_config/CMakeLists.txt
+++ b/ydb/library/yaml_config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/ycloud/api/CMakeLists.darwin.txt b/ydb/library/ycloud/api/CMakeLists.darwin-x86_64.txt
index a05d4db537..a05d4db537 100644
--- a/ydb/library/ycloud/api/CMakeLists.darwin.txt
+++ b/ydb/library/ycloud/api/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/ycloud/api/CMakeLists.linux.txt b/ydb/library/ycloud/api/CMakeLists.linux-x86_64.txt
index 9a11131146..9a11131146 100644
--- a/ydb/library/ycloud/api/CMakeLists.linux.txt
+++ b/ydb/library/ycloud/api/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/ycloud/api/CMakeLists.txt b/ydb/library/ycloud/api/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/ycloud/api/CMakeLists.txt
+++ b/ydb/library/ycloud/api/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/ycloud/impl/CMakeLists.darwin.txt b/ydb/library/ycloud/impl/CMakeLists.darwin-x86_64.txt
index 930273011a..930273011a 100644
--- a/ydb/library/ycloud/impl/CMakeLists.darwin.txt
+++ b/ydb/library/ycloud/impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/ycloud/impl/CMakeLists.linux.txt b/ydb/library/ycloud/impl/CMakeLists.linux-x86_64.txt
index d3c4ab6ba6..d3c4ab6ba6 100644
--- a/ydb/library/ycloud/impl/CMakeLists.linux.txt
+++ b/ydb/library/ycloud/impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/ycloud/impl/CMakeLists.txt b/ydb/library/ycloud/impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/ycloud/impl/CMakeLists.txt
+++ b/ydb/library/ycloud/impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/ycloud/impl/ut/CMakeLists.darwin.txt b/ydb/library/ycloud/impl/ut/CMakeLists.darwin-x86_64.txt
index 25fc6c5b42..25fc6c5b42 100644
--- a/ydb/library/ycloud/impl/ut/CMakeLists.darwin.txt
+++ b/ydb/library/ycloud/impl/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/ycloud/impl/ut/CMakeLists.linux.txt b/ydb/library/ycloud/impl/ut/CMakeLists.linux-x86_64.txt
index 6c791e84d1..6c791e84d1 100644
--- a/ydb/library/ycloud/impl/ut/CMakeLists.linux.txt
+++ b/ydb/library/ycloud/impl/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/ycloud/impl/ut/CMakeLists.txt b/ydb/library/ycloud/impl/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/ycloud/impl/ut/CMakeLists.txt
+++ b/ydb/library/ycloud/impl/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/ast/CMakeLists.darwin.txt b/ydb/library/yql/ast/CMakeLists.darwin-x86_64.txt
index e8073842db..e8073842db 100644
--- a/ydb/library/yql/ast/CMakeLists.darwin.txt
+++ b/ydb/library/yql/ast/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/ast/CMakeLists.linux.txt b/ydb/library/yql/ast/CMakeLists.linux-x86_64.txt
index cca3dc9ca0..cca3dc9ca0 100644
--- a/ydb/library/yql/ast/CMakeLists.linux.txt
+++ b/ydb/library/yql/ast/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/ast/CMakeLists.txt b/ydb/library/yql/ast/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/ast/CMakeLists.txt
+++ b/ydb/library/yql/ast/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/ast/serialize/CMakeLists.darwin.txt b/ydb/library/yql/ast/serialize/CMakeLists.darwin-x86_64.txt
index b250700c13..b250700c13 100644
--- a/ydb/library/yql/ast/serialize/CMakeLists.darwin.txt
+++ b/ydb/library/yql/ast/serialize/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/ast/serialize/CMakeLists.linux.txt b/ydb/library/yql/ast/serialize/CMakeLists.linux-x86_64.txt
index 4965fbd1af..4965fbd1af 100644
--- a/ydb/library/yql/ast/serialize/CMakeLists.linux.txt
+++ b/ydb/library/yql/ast/serialize/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/ast/serialize/CMakeLists.txt b/ydb/library/yql/ast/serialize/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/ast/serialize/CMakeLists.txt
+++ b/ydb/library/yql/ast/serialize/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/ast/ut/CMakeLists.darwin.txt b/ydb/library/yql/ast/ut/CMakeLists.darwin-x86_64.txt
index daae4e243b..daae4e243b 100644
--- a/ydb/library/yql/ast/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/ast/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/ast/ut/CMakeLists.linux.txt b/ydb/library/yql/ast/ut/CMakeLists.linux-x86_64.txt
index ffc60ee199..ffc60ee199 100644
--- a/ydb/library/yql/ast/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/ast/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/ast/ut/CMakeLists.txt b/ydb/library/yql/ast/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/ast/ut/CMakeLists.txt
+++ b/ydb/library/yql/ast/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/CMakeLists.darwin.txt b/ydb/library/yql/core/CMakeLists.darwin-x86_64.txt
index 309e84a6e4..309e84a6e4 100644
--- a/ydb/library/yql/core/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/CMakeLists.linux.txt b/ydb/library/yql/core/CMakeLists.linux-x86_64.txt
index 84c9994fd8..84c9994fd8 100644
--- a/ydb/library/yql/core/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/CMakeLists.txt b/ydb/library/yql/core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/CMakeLists.txt
+++ b/ydb/library/yql/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/common_opt/CMakeLists.darwin.txt b/ydb/library/yql/core/common_opt/CMakeLists.darwin-x86_64.txt
index bc3eca545a..bc3eca545a 100644
--- a/ydb/library/yql/core/common_opt/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/common_opt/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/common_opt/CMakeLists.linux.txt b/ydb/library/yql/core/common_opt/CMakeLists.linux-x86_64.txt
index 35d9e8b6f7..35d9e8b6f7 100644
--- a/ydb/library/yql/core/common_opt/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/common_opt/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/common_opt/CMakeLists.txt b/ydb/library/yql/core/common_opt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/common_opt/CMakeLists.txt
+++ b/ydb/library/yql/core/common_opt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/credentials/CMakeLists.darwin.txt b/ydb/library/yql/core/credentials/CMakeLists.darwin-x86_64.txt
index 5c9782c75c..5c9782c75c 100644
--- a/ydb/library/yql/core/credentials/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/credentials/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/credentials/CMakeLists.linux.txt b/ydb/library/yql/core/credentials/CMakeLists.linux-x86_64.txt
index a765a3170f..a765a3170f 100644
--- a/ydb/library/yql/core/credentials/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/credentials/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/credentials/CMakeLists.txt b/ydb/library/yql/core/credentials/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/credentials/CMakeLists.txt
+++ b/ydb/library/yql/core/credentials/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/core/expr_nodes/CMakeLists.darwin-x86_64.txt
index 43e5158e79..43e5158e79 100644
--- a/ydb/library/yql/core/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/core/expr_nodes/CMakeLists.linux-x86_64.txt
index 5838e737ef..5838e737ef 100644
--- a/ydb/library/yql/core/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/expr_nodes/CMakeLists.txt b/ydb/library/yql/core/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/core/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/expr_nodes_gen/CMakeLists.darwin.txt b/ydb/library/yql/core/expr_nodes_gen/CMakeLists.darwin-x86_64.txt
index cc364257b1..cc364257b1 100644
--- a/ydb/library/yql/core/expr_nodes_gen/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/expr_nodes_gen/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/expr_nodes_gen/CMakeLists.linux.txt b/ydb/library/yql/core/expr_nodes_gen/CMakeLists.linux-x86_64.txt
index cdbd4f403d..cdbd4f403d 100644
--- a/ydb/library/yql/core/expr_nodes_gen/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/expr_nodes_gen/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/expr_nodes_gen/CMakeLists.txt b/ydb/library/yql/core/expr_nodes_gen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/expr_nodes_gen/CMakeLists.txt
+++ b/ydb/library/yql/core/expr_nodes_gen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/extract_predicate/CMakeLists.darwin.txt b/ydb/library/yql/core/extract_predicate/CMakeLists.darwin-x86_64.txt
index 5d57ad086b..5d57ad086b 100644
--- a/ydb/library/yql/core/extract_predicate/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/extract_predicate/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/extract_predicate/CMakeLists.linux.txt b/ydb/library/yql/core/extract_predicate/CMakeLists.linux-x86_64.txt
index e9633e8f37..e9633e8f37 100644
--- a/ydb/library/yql/core/extract_predicate/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/extract_predicate/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/extract_predicate/CMakeLists.txt b/ydb/library/yql/core/extract_predicate/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/extract_predicate/CMakeLists.txt
+++ b/ydb/library/yql/core/extract_predicate/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/facade/CMakeLists.darwin.txt b/ydb/library/yql/core/facade/CMakeLists.darwin-x86_64.txt
index 132297fce4..132297fce4 100644
--- a/ydb/library/yql/core/facade/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/facade/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/facade/CMakeLists.linux.txt b/ydb/library/yql/core/facade/CMakeLists.linux-x86_64.txt
index f5858e8c2c..f5858e8c2c 100644
--- a/ydb/library/yql/core/facade/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/facade/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/facade/CMakeLists.txt b/ydb/library/yql/core/facade/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/facade/CMakeLists.txt
+++ b/ydb/library/yql/core/facade/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/file_storage/CMakeLists.darwin.txt b/ydb/library/yql/core/file_storage/CMakeLists.darwin-x86_64.txt
index 574c5b1c75..574c5b1c75 100644
--- a/ydb/library/yql/core/file_storage/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/file_storage/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/CMakeLists.linux.txt b/ydb/library/yql/core/file_storage/CMakeLists.linux-x86_64.txt
index 479f52e981..479f52e981 100644
--- a/ydb/library/yql/core/file_storage/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/file_storage/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/CMakeLists.txt b/ydb/library/yql/core/file_storage/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/file_storage/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/file_storage/defs/CMakeLists.darwin.txt b/ydb/library/yql/core/file_storage/defs/CMakeLists.darwin-x86_64.txt
index be8470792e..be8470792e 100644
--- a/ydb/library/yql/core/file_storage/defs/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/file_storage/defs/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/defs/CMakeLists.linux.txt b/ydb/library/yql/core/file_storage/defs/CMakeLists.linux-x86_64.txt
index 04952d1140..04952d1140 100644
--- a/ydb/library/yql/core/file_storage/defs/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/file_storage/defs/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/defs/CMakeLists.txt b/ydb/library/yql/core/file_storage/defs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/file_storage/defs/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/defs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/file_storage/download/CMakeLists.darwin.txt b/ydb/library/yql/core/file_storage/download/CMakeLists.darwin-x86_64.txt
index 3787f95f28..3787f95f28 100644
--- a/ydb/library/yql/core/file_storage/download/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/file_storage/download/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/download/CMakeLists.linux.txt b/ydb/library/yql/core/file_storage/download/CMakeLists.linux-x86_64.txt
index a36c440c4f..a36c440c4f 100644
--- a/ydb/library/yql/core/file_storage/download/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/file_storage/download/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/download/CMakeLists.txt b/ydb/library/yql/core/file_storage/download/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/file_storage/download/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/download/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/file_storage/http_download/CMakeLists.darwin.txt b/ydb/library/yql/core/file_storage/http_download/CMakeLists.darwin-x86_64.txt
index 914fca536f..914fca536f 100644
--- a/ydb/library/yql/core/file_storage/http_download/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/file_storage/http_download/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/http_download/CMakeLists.linux.txt b/ydb/library/yql/core/file_storage/http_download/CMakeLists.linux-x86_64.txt
index 68bd56be50..68bd56be50 100644
--- a/ydb/library/yql/core/file_storage/http_download/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/file_storage/http_download/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/http_download/CMakeLists.txt b/ydb/library/yql/core/file_storage/http_download/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/file_storage/http_download/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/http_download/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.darwin.txt b/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.darwin-x86_64.txt
index a162bb7e14..a162bb7e14 100644
--- a/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.linux.txt b/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.linux-x86_64.txt
index bc86b2fc12..bc86b2fc12 100644
--- a/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.txt b/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/http_download/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/file_storage/proto/CMakeLists.darwin.txt b/ydb/library/yql/core/file_storage/proto/CMakeLists.darwin-x86_64.txt
index 2f9785282f..2f9785282f 100644
--- a/ydb/library/yql/core/file_storage/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/file_storage/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/proto/CMakeLists.linux.txt b/ydb/library/yql/core/file_storage/proto/CMakeLists.linux-x86_64.txt
index b93e2f129a..b93e2f129a 100644
--- a/ydb/library/yql/core/file_storage/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/file_storage/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/proto/CMakeLists.txt b/ydb/library/yql/core/file_storage/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/file_storage/proto/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/file_storage/ut/CMakeLists.darwin.txt b/ydb/library/yql/core/file_storage/ut/CMakeLists.darwin-x86_64.txt
index fe6f62f978..fe6f62f978 100644
--- a/ydb/library/yql/core/file_storage/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/file_storage/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/ut/CMakeLists.linux.txt b/ydb/library/yql/core/file_storage/ut/CMakeLists.linux-x86_64.txt
index fb7652b623..fb7652b623 100644
--- a/ydb/library/yql/core/file_storage/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/file_storage/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/file_storage/ut/CMakeLists.txt b/ydb/library/yql/core/file_storage/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/file_storage/ut/CMakeLists.txt
+++ b/ydb/library/yql/core/file_storage/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/issue/CMakeLists.darwin.txt b/ydb/library/yql/core/issue/CMakeLists.darwin-x86_64.txt
index 5f3635f372..5f3635f372 100644
--- a/ydb/library/yql/core/issue/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/issue/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/issue/CMakeLists.linux.txt b/ydb/library/yql/core/issue/CMakeLists.linux-x86_64.txt
index baa6e9014e..baa6e9014e 100644
--- a/ydb/library/yql/core/issue/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/issue/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/issue/CMakeLists.txt b/ydb/library/yql/core/issue/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/issue/CMakeLists.txt
+++ b/ydb/library/yql/core/issue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/issue/protos/CMakeLists.darwin.txt b/ydb/library/yql/core/issue/protos/CMakeLists.darwin-x86_64.txt
index 1cc572225f..1cc572225f 100644
--- a/ydb/library/yql/core/issue/protos/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/issue/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/issue/protos/CMakeLists.linux.txt b/ydb/library/yql/core/issue/protos/CMakeLists.linux-x86_64.txt
index 77f8a56e52..77f8a56e52 100644
--- a/ydb/library/yql/core/issue/protos/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/issue/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/issue/protos/CMakeLists.txt b/ydb/library/yql/core/issue/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/issue/protos/CMakeLists.txt
+++ b/ydb/library/yql/core/issue/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/issue/ut/CMakeLists.darwin.txt b/ydb/library/yql/core/issue/ut/CMakeLists.darwin-x86_64.txt
index 8b0bff17df..8b0bff17df 100644
--- a/ydb/library/yql/core/issue/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/issue/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/issue/ut/CMakeLists.linux.txt b/ydb/library/yql/core/issue/ut/CMakeLists.linux-x86_64.txt
index 0555f3e54e..0555f3e54e 100644
--- a/ydb/library/yql/core/issue/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/issue/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/issue/ut/CMakeLists.txt b/ydb/library/yql/core/issue/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/issue/ut/CMakeLists.txt
+++ b/ydb/library/yql/core/issue/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/peephole_opt/CMakeLists.darwin.txt b/ydb/library/yql/core/peephole_opt/CMakeLists.darwin-x86_64.txt
index fa54b0a08b..fa54b0a08b 100644
--- a/ydb/library/yql/core/peephole_opt/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/peephole_opt/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/peephole_opt/CMakeLists.linux.txt b/ydb/library/yql/core/peephole_opt/CMakeLists.linux-x86_64.txt
index 1bbb34cbc4..1bbb34cbc4 100644
--- a/ydb/library/yql/core/peephole_opt/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/peephole_opt/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/peephole_opt/CMakeLists.txt b/ydb/library/yql/core/peephole_opt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/peephole_opt/CMakeLists.txt
+++ b/ydb/library/yql/core/peephole_opt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/services/CMakeLists.darwin.txt b/ydb/library/yql/core/services/CMakeLists.darwin-x86_64.txt
index f3d30a1dc4..f3d30a1dc4 100644
--- a/ydb/library/yql/core/services/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/services/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/services/CMakeLists.linux.txt b/ydb/library/yql/core/services/CMakeLists.linux-x86_64.txt
index 40977337e7..40977337e7 100644
--- a/ydb/library/yql/core/services/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/services/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/services/CMakeLists.txt b/ydb/library/yql/core/services/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/services/CMakeLists.txt
+++ b/ydb/library/yql/core/services/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/services/mounts/CMakeLists.darwin.txt b/ydb/library/yql/core/services/mounts/CMakeLists.darwin-x86_64.txt
index 21c6fedd14..21c6fedd14 100644
--- a/ydb/library/yql/core/services/mounts/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/services/mounts/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/services/mounts/CMakeLists.linux.txt b/ydb/library/yql/core/services/mounts/CMakeLists.linux-x86_64.txt
index 83a9cd73e8..83a9cd73e8 100644
--- a/ydb/library/yql/core/services/mounts/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/services/mounts/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/services/mounts/CMakeLists.txt b/ydb/library/yql/core/services/mounts/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/services/mounts/CMakeLists.txt
+++ b/ydb/library/yql/core/services/mounts/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/sql_types/CMakeLists.darwin.txt b/ydb/library/yql/core/sql_types/CMakeLists.darwin-x86_64.txt
index 6c1a4cb9ee..6c1a4cb9ee 100644
--- a/ydb/library/yql/core/sql_types/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/sql_types/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/sql_types/CMakeLists.linux.txt b/ydb/library/yql/core/sql_types/CMakeLists.linux-x86_64.txt
index e4181a0333..e4181a0333 100644
--- a/ydb/library/yql/core/sql_types/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/sql_types/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/sql_types/CMakeLists.txt b/ydb/library/yql/core/sql_types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/sql_types/CMakeLists.txt
+++ b/ydb/library/yql/core/sql_types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/type_ann/CMakeLists.darwin.txt b/ydb/library/yql/core/type_ann/CMakeLists.darwin-x86_64.txt
index fa886f3f5f..fa886f3f5f 100644
--- a/ydb/library/yql/core/type_ann/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/type_ann/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/type_ann/CMakeLists.linux.txt b/ydb/library/yql/core/type_ann/CMakeLists.linux-x86_64.txt
index 20e6920d03..20e6920d03 100644
--- a/ydb/library/yql/core/type_ann/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/type_ann/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/type_ann/CMakeLists.txt b/ydb/library/yql/core/type_ann/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/type_ann/CMakeLists.txt
+++ b/ydb/library/yql/core/type_ann/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/core/user_data/CMakeLists.darwin.txt b/ydb/library/yql/core/user_data/CMakeLists.darwin-x86_64.txt
index 061ae0bfad..061ae0bfad 100644
--- a/ydb/library/yql/core/user_data/CMakeLists.darwin.txt
+++ b/ydb/library/yql/core/user_data/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/core/user_data/CMakeLists.linux.txt b/ydb/library/yql/core/user_data/CMakeLists.linux-x86_64.txt
index 98b594944f..98b594944f 100644
--- a/ydb/library/yql/core/user_data/CMakeLists.linux.txt
+++ b/ydb/library/yql/core/user_data/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/core/user_data/CMakeLists.txt b/ydb/library/yql/core/user_data/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/core/user_data/CMakeLists.txt
+++ b/ydb/library/yql/core/user_data/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/actors/CMakeLists.darwin.txt b/ydb/library/yql/dq/actors/CMakeLists.darwin-x86_64.txt
index 1747265bae..1747265bae 100644
--- a/ydb/library/yql/dq/actors/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/CMakeLists.linux.txt b/ydb/library/yql/dq/actors/CMakeLists.linux-x86_64.txt
index af14a84926..af14a84926 100644
--- a/ydb/library/yql/dq/actors/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/CMakeLists.txt b/ydb/library/yql/dq/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/actors/CMakeLists.txt
+++ b/ydb/library/yql/dq/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/actors/compute/CMakeLists.darwin.txt b/ydb/library/yql/dq/actors/compute/CMakeLists.darwin-x86_64.txt
index b318ad0340..b318ad0340 100644
--- a/ydb/library/yql/dq/actors/compute/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/actors/compute/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/compute/CMakeLists.linux.txt b/ydb/library/yql/dq/actors/compute/CMakeLists.linux-x86_64.txt
index 9e1ea7a9fc..9e1ea7a9fc 100644
--- a/ydb/library/yql/dq/actors/compute/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/actors/compute/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/compute/CMakeLists.txt b/ydb/library/yql/dq/actors/compute/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/actors/compute/CMakeLists.txt
+++ b/ydb/library/yql/dq/actors/compute/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/actors/compute/ut/CMakeLists.darwin.txt b/ydb/library/yql/dq/actors/compute/ut/CMakeLists.darwin-x86_64.txt
index 1054789c72..1054789c72 100644
--- a/ydb/library/yql/dq/actors/compute/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/actors/compute/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/compute/ut/CMakeLists.linux.txt b/ydb/library/yql/dq/actors/compute/ut/CMakeLists.linux-x86_64.txt
index 3a50ae828d..3a50ae828d 100644
--- a/ydb/library/yql/dq/actors/compute/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/actors/compute/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/compute/ut/CMakeLists.txt b/ydb/library/yql/dq/actors/compute/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/actors/compute/ut/CMakeLists.txt
+++ b/ydb/library/yql/dq/actors/compute/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/actors/protos/CMakeLists.darwin.txt b/ydb/library/yql/dq/actors/protos/CMakeLists.darwin-x86_64.txt
index d2723d4773..d2723d4773 100644
--- a/ydb/library/yql/dq/actors/protos/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/actors/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/protos/CMakeLists.linux.txt b/ydb/library/yql/dq/actors/protos/CMakeLists.linux-x86_64.txt
index c73567f56e..c73567f56e 100644
--- a/ydb/library/yql/dq/actors/protos/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/actors/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/protos/CMakeLists.txt b/ydb/library/yql/dq/actors/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/actors/protos/CMakeLists.txt
+++ b/ydb/library/yql/dq/actors/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/actors/task_runner/CMakeLists.darwin.txt b/ydb/library/yql/dq/actors/task_runner/CMakeLists.darwin-x86_64.txt
index 70619e9194..70619e9194 100644
--- a/ydb/library/yql/dq/actors/task_runner/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/actors/task_runner/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux.txt b/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-x86_64.txt
index 6597ed4504..6597ed4504 100644
--- a/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/actors/task_runner/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/actors/task_runner/CMakeLists.txt b/ydb/library/yql/dq/actors/task_runner/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/actors/task_runner/CMakeLists.txt
+++ b/ydb/library/yql/dq/actors/task_runner/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/common/CMakeLists.darwin.txt b/ydb/library/yql/dq/common/CMakeLists.darwin-x86_64.txt
index 85bc6ce671..85bc6ce671 100644
--- a/ydb/library/yql/dq/common/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/common/CMakeLists.linux.txt b/ydb/library/yql/dq/common/CMakeLists.linux-x86_64.txt
index 8c5248faa4..8c5248faa4 100644
--- a/ydb/library/yql/dq/common/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/common/CMakeLists.txt b/ydb/library/yql/dq/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/common/CMakeLists.txt
+++ b/ydb/library/yql/dq/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/comp_nodes/CMakeLists.darwin.txt b/ydb/library/yql/dq/comp_nodes/CMakeLists.darwin-x86_64.txt
index 7f99932881..7f99932881 100644
--- a/ydb/library/yql/dq/comp_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/comp_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/comp_nodes/CMakeLists.linux.txt b/ydb/library/yql/dq/comp_nodes/CMakeLists.linux-x86_64.txt
index f53158a505..f53158a505 100644
--- a/ydb/library/yql/dq/comp_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/comp_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/comp_nodes/CMakeLists.txt b/ydb/library/yql/dq/comp_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/comp_nodes/CMakeLists.txt
+++ b/ydb/library/yql/dq/comp_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/dq/expr_nodes/CMakeLists.darwin-x86_64.txt
index d81b9b9d69..d81b9b9d69 100644
--- a/ydb/library/yql/dq/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/dq/expr_nodes/CMakeLists.linux-x86_64.txt
index 2f618c2bd2..2f618c2bd2 100644
--- a/ydb/library/yql/dq/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/expr_nodes/CMakeLists.txt b/ydb/library/yql/dq/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/dq/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/integration/CMakeLists.darwin.txt b/ydb/library/yql/dq/integration/CMakeLists.darwin-x86_64.txt
index 2213c8b415..2213c8b415 100644
--- a/ydb/library/yql/dq/integration/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/integration/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/integration/CMakeLists.linux.txt b/ydb/library/yql/dq/integration/CMakeLists.linux-x86_64.txt
index f01517462e..f01517462e 100644
--- a/ydb/library/yql/dq/integration/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/integration/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/integration/CMakeLists.txt b/ydb/library/yql/dq/integration/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/integration/CMakeLists.txt
+++ b/ydb/library/yql/dq/integration/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/integration/transform/CMakeLists.darwin.txt b/ydb/library/yql/dq/integration/transform/CMakeLists.darwin-x86_64.txt
index cafad8055c..cafad8055c 100644
--- a/ydb/library/yql/dq/integration/transform/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/integration/transform/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/integration/transform/CMakeLists.linux.txt b/ydb/library/yql/dq/integration/transform/CMakeLists.linux-x86_64.txt
index 24f0a05452..24f0a05452 100644
--- a/ydb/library/yql/dq/integration/transform/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/integration/transform/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/integration/transform/CMakeLists.txt b/ydb/library/yql/dq/integration/transform/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/integration/transform/CMakeLists.txt
+++ b/ydb/library/yql/dq/integration/transform/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/opt/CMakeLists.darwin.txt b/ydb/library/yql/dq/opt/CMakeLists.darwin-x86_64.txt
index c729a2f2e1..c729a2f2e1 100644
--- a/ydb/library/yql/dq/opt/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/opt/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/opt/CMakeLists.linux.txt b/ydb/library/yql/dq/opt/CMakeLists.linux-x86_64.txt
index 9271a730d4..9271a730d4 100644
--- a/ydb/library/yql/dq/opt/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/opt/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/opt/CMakeLists.txt b/ydb/library/yql/dq/opt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/opt/CMakeLists.txt
+++ b/ydb/library/yql/dq/opt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/proto/CMakeLists.darwin.txt b/ydb/library/yql/dq/proto/CMakeLists.darwin-x86_64.txt
index 26eb430d3d..26eb430d3d 100644
--- a/ydb/library/yql/dq/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/proto/CMakeLists.linux.txt b/ydb/library/yql/dq/proto/CMakeLists.linux-x86_64.txt
index 32c5c7d3f6..32c5c7d3f6 100644
--- a/ydb/library/yql/dq/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/proto/CMakeLists.txt b/ydb/library/yql/dq/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/proto/CMakeLists.txt
+++ b/ydb/library/yql/dq/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/runtime/CMakeLists.darwin.txt b/ydb/library/yql/dq/runtime/CMakeLists.darwin-x86_64.txt
index 832cd654ae..832cd654ae 100644
--- a/ydb/library/yql/dq/runtime/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/runtime/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/runtime/CMakeLists.linux.txt b/ydb/library/yql/dq/runtime/CMakeLists.linux-x86_64.txt
index 44a41a06db..44a41a06db 100644
--- a/ydb/library/yql/dq/runtime/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/runtime/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/runtime/CMakeLists.txt b/ydb/library/yql/dq/runtime/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/runtime/CMakeLists.txt
+++ b/ydb/library/yql/dq/runtime/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/runtime/ut/CMakeLists.darwin.txt b/ydb/library/yql/dq/runtime/ut/CMakeLists.darwin-x86_64.txt
index 2e71f1e95a..2e71f1e95a 100644
--- a/ydb/library/yql/dq/runtime/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/runtime/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/runtime/ut/CMakeLists.linux.txt b/ydb/library/yql/dq/runtime/ut/CMakeLists.linux-x86_64.txt
index bf10f0d800..bf10f0d800 100644
--- a/ydb/library/yql/dq/runtime/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/runtime/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/runtime/ut/CMakeLists.txt b/ydb/library/yql/dq/runtime/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/runtime/ut/CMakeLists.txt
+++ b/ydb/library/yql/dq/runtime/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/state/CMakeLists.darwin.txt b/ydb/library/yql/dq/state/CMakeLists.darwin-x86_64.txt
index 47acf41667..47acf41667 100644
--- a/ydb/library/yql/dq/state/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/state/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/state/CMakeLists.linux.txt b/ydb/library/yql/dq/state/CMakeLists.linux-x86_64.txt
index ef207c4656..ef207c4656 100644
--- a/ydb/library/yql/dq/state/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/state/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/state/CMakeLists.txt b/ydb/library/yql/dq/state/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/state/CMakeLists.txt
+++ b/ydb/library/yql/dq/state/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/state/ut/CMakeLists.darwin.txt b/ydb/library/yql/dq/state/ut/CMakeLists.darwin-x86_64.txt
index 25eb12ebaa..25eb12ebaa 100644
--- a/ydb/library/yql/dq/state/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/state/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/state/ut/CMakeLists.linux.txt b/ydb/library/yql/dq/state/ut/CMakeLists.linux-x86_64.txt
index dd1ee4a7fc..dd1ee4a7fc 100644
--- a/ydb/library/yql/dq/state/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/state/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/state/ut/CMakeLists.txt b/ydb/library/yql/dq/state/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/state/ut/CMakeLists.txt
+++ b/ydb/library/yql/dq/state/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/tasks/CMakeLists.darwin.txt b/ydb/library/yql/dq/tasks/CMakeLists.darwin-x86_64.txt
index 0e247f5b01..0e247f5b01 100644
--- a/ydb/library/yql/dq/tasks/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/tasks/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/tasks/CMakeLists.linux.txt b/ydb/library/yql/dq/tasks/CMakeLists.linux-x86_64.txt
index 55c309997b..55c309997b 100644
--- a/ydb/library/yql/dq/tasks/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/tasks/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/tasks/CMakeLists.txt b/ydb/library/yql/dq/tasks/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/tasks/CMakeLists.txt
+++ b/ydb/library/yql/dq/tasks/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/transform/CMakeLists.darwin.txt b/ydb/library/yql/dq/transform/CMakeLists.darwin-x86_64.txt
index 315e018225..315e018225 100644
--- a/ydb/library/yql/dq/transform/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/transform/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/transform/CMakeLists.linux.txt b/ydb/library/yql/dq/transform/CMakeLists.linux-x86_64.txt
index ff643b33cf..ff643b33cf 100644
--- a/ydb/library/yql/dq/transform/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/transform/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/transform/CMakeLists.txt b/ydb/library/yql/dq/transform/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/transform/CMakeLists.txt
+++ b/ydb/library/yql/dq/transform/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/dq/type_ann/CMakeLists.darwin.txt b/ydb/library/yql/dq/type_ann/CMakeLists.darwin-x86_64.txt
index 6516783acb..6516783acb 100644
--- a/ydb/library/yql/dq/type_ann/CMakeLists.darwin.txt
+++ b/ydb/library/yql/dq/type_ann/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/dq/type_ann/CMakeLists.linux.txt b/ydb/library/yql/dq/type_ann/CMakeLists.linux-x86_64.txt
index acab33a299..acab33a299 100644
--- a/ydb/library/yql/dq/type_ann/CMakeLists.linux.txt
+++ b/ydb/library/yql/dq/type_ann/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/dq/type_ann/CMakeLists.txt b/ydb/library/yql/dq/type_ann/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/dq/type_ann/CMakeLists.txt
+++ b/ydb/library/yql/dq/type_ann/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/CMakeLists.darwin.txt b/ydb/library/yql/minikql/CMakeLists.darwin-x86_64.txt
index fd57dace96..fd57dace96 100644
--- a/ydb/library/yql/minikql/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/CMakeLists.linux.txt b/ydb/library/yql/minikql/CMakeLists.linux-x86_64.txt
index 0a61593707..0a61593707 100644
--- a/ydb/library/yql/minikql/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/CMakeLists.txt b/ydb/library/yql/minikql/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/CMakeLists.txt
+++ b/ydb/library/yql/minikql/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/arrow/CMakeLists.darwin.txt b/ydb/library/yql/minikql/arrow/CMakeLists.darwin-x86_64.txt
index 5bb17a45a4..5bb17a45a4 100644
--- a/ydb/library/yql/minikql/arrow/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/arrow/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/arrow/CMakeLists.linux.txt b/ydb/library/yql/minikql/arrow/CMakeLists.linux-x86_64.txt
index 7321351567..7321351567 100644
--- a/ydb/library/yql/minikql/arrow/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/arrow/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/arrow/CMakeLists.txt b/ydb/library/yql/minikql/arrow/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/arrow/CMakeLists.txt
+++ b/ydb/library/yql/minikql/arrow/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.darwin.txt b/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.darwin-x86_64.txt
index b897abcb4f..b897abcb4f 100644
--- a/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.linux.txt b/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.linux-x86_64.txt
index 87b6a845da..87b6a845da 100644
--- a/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.txt b/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.txt
+++ b/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/codegen/CMakeLists.darwin.txt b/ydb/library/yql/minikql/codegen/CMakeLists.darwin-x86_64.txt
index cf7af4749a..cf7af4749a 100644
--- a/ydb/library/yql/minikql/codegen/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/codegen/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/codegen/CMakeLists.linux.txt b/ydb/library/yql/minikql/codegen/CMakeLists.linux-x86_64.txt
index 49938a8c46..49938a8c46 100644
--- a/ydb/library/yql/minikql/codegen/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/codegen/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/codegen/CMakeLists.txt b/ydb/library/yql/minikql/codegen/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/codegen/CMakeLists.txt
+++ b/ydb/library/yql/minikql/codegen/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/comp_nodes/CMakeLists.darwin.txt b/ydb/library/yql/minikql/comp_nodes/CMakeLists.darwin-x86_64.txt
index 52aec2119d..52aec2119d 100644
--- a/ydb/library/yql/minikql/comp_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/comp_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/comp_nodes/CMakeLists.linux.txt b/ydb/library/yql/minikql/comp_nodes/CMakeLists.linux-x86_64.txt
index 5819bbc6d3..5819bbc6d3 100644
--- a/ydb/library/yql/minikql/comp_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/comp_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/comp_nodes/CMakeLists.txt b/ydb/library/yql/minikql/comp_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/comp_nodes/CMakeLists.txt
+++ b/ydb/library/yql/minikql/comp_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/computation/CMakeLists.darwin.txt b/ydb/library/yql/minikql/computation/CMakeLists.darwin-x86_64.txt
index dc5f3b95ff..dc5f3b95ff 100644
--- a/ydb/library/yql/minikql/computation/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/computation/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/computation/CMakeLists.linux.txt b/ydb/library/yql/minikql/computation/CMakeLists.linux-x86_64.txt
index 584d25a4ff..584d25a4ff 100644
--- a/ydb/library/yql/minikql/computation/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/computation/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/computation/CMakeLists.txt b/ydb/library/yql/minikql/computation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/computation/CMakeLists.txt
+++ b/ydb/library/yql/minikql/computation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/datetime/CMakeLists.darwin.txt b/ydb/library/yql/minikql/datetime/CMakeLists.darwin-x86_64.txt
index 4bbd8d7f7f..4bbd8d7f7f 100644
--- a/ydb/library/yql/minikql/datetime/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/datetime/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/datetime/CMakeLists.linux.txt b/ydb/library/yql/minikql/datetime/CMakeLists.linux-x86_64.txt
index fd222e8358..fd222e8358 100644
--- a/ydb/library/yql/minikql/datetime/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/datetime/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/datetime/CMakeLists.txt b/ydb/library/yql/minikql/datetime/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/datetime/CMakeLists.txt
+++ b/ydb/library/yql/minikql/datetime/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/dom/CMakeLists.darwin.txt b/ydb/library/yql/minikql/dom/CMakeLists.darwin-x86_64.txt
index 4d9af8a9e9..4d9af8a9e9 100644
--- a/ydb/library/yql/minikql/dom/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/dom/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/dom/CMakeLists.linux.txt b/ydb/library/yql/minikql/dom/CMakeLists.linux-x86_64.txt
index 5d15504310..5d15504310 100644
--- a/ydb/library/yql/minikql/dom/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/dom/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/dom/CMakeLists.txt b/ydb/library/yql/minikql/dom/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/dom/CMakeLists.txt
+++ b/ydb/library/yql/minikql/dom/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/invoke_builtins/CMakeLists.darwin.txt b/ydb/library/yql/minikql/invoke_builtins/CMakeLists.darwin-x86_64.txt
index 4bedc84e58..4bedc84e58 100644
--- a/ydb/library/yql/minikql/invoke_builtins/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/invoke_builtins/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/invoke_builtins/CMakeLists.linux.txt b/ydb/library/yql/minikql/invoke_builtins/CMakeLists.linux-x86_64.txt
index 505826459a..505826459a 100644
--- a/ydb/library/yql/minikql/invoke_builtins/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/invoke_builtins/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/invoke_builtins/CMakeLists.txt b/ydb/library/yql/minikql/invoke_builtins/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/invoke_builtins/CMakeLists.txt
+++ b/ydb/library/yql/minikql/invoke_builtins/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/jsonpath/CMakeLists.darwin.txt b/ydb/library/yql/minikql/jsonpath/CMakeLists.darwin-x86_64.txt
index 5609a579c1..5609a579c1 100644
--- a/ydb/library/yql/minikql/jsonpath/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/jsonpath/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/jsonpath/CMakeLists.linux.txt b/ydb/library/yql/minikql/jsonpath/CMakeLists.linux-x86_64.txt
index e937c71565..e937c71565 100644
--- a/ydb/library/yql/minikql/jsonpath/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/jsonpath/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/jsonpath/CMakeLists.txt b/ydb/library/yql/minikql/jsonpath/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/jsonpath/CMakeLists.txt
+++ b/ydb/library/yql/minikql/jsonpath/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.darwin.txt b/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.darwin-x86_64.txt
index 09cef24141..09cef24141 100644
--- a/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.linux.txt b/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.linux-x86_64.txt
index 3ebb3572b8..3ebb3572b8 100644
--- a/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.txt b/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.txt
+++ b/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/perf/alloc/CMakeLists.darwin.txt b/ydb/library/yql/minikql/perf/alloc/CMakeLists.darwin-x86_64.txt
index fbc86c388e..fbc86c388e 100644
--- a/ydb/library/yql/minikql/perf/alloc/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/perf/alloc/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/alloc/CMakeLists.linux.txt b/ydb/library/yql/minikql/perf/alloc/CMakeLists.linux-x86_64.txt
index c0a44cd212..c0a44cd212 100644
--- a/ydb/library/yql/minikql/perf/alloc/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/perf/alloc/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/alloc/CMakeLists.txt b/ydb/library/yql/minikql/perf/alloc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/perf/alloc/CMakeLists.txt
+++ b/ydb/library/yql/minikql/perf/alloc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/perf/mt_param/CMakeLists.darwin.txt b/ydb/library/yql/minikql/perf/mt_param/CMakeLists.darwin-x86_64.txt
index 19060c7bc3..19060c7bc3 100644
--- a/ydb/library/yql/minikql/perf/mt_param/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/perf/mt_param/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/mt_param/CMakeLists.linux.txt b/ydb/library/yql/minikql/perf/mt_param/CMakeLists.linux-x86_64.txt
index 8cec706451..8cec706451 100644
--- a/ydb/library/yql/minikql/perf/mt_param/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/perf/mt_param/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/mt_param/CMakeLists.txt b/ydb/library/yql/minikql/perf/mt_param/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/perf/mt_param/CMakeLists.txt
+++ b/ydb/library/yql/minikql/perf/mt_param/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/perf/packer/CMakeLists.darwin.txt b/ydb/library/yql/minikql/perf/packer/CMakeLists.darwin-x86_64.txt
index 512e840d1a..512e840d1a 100644
--- a/ydb/library/yql/minikql/perf/packer/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/perf/packer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/packer/CMakeLists.linux.txt b/ydb/library/yql/minikql/perf/packer/CMakeLists.linux-x86_64.txt
index 48ec6d8d71..48ec6d8d71 100644
--- a/ydb/library/yql/minikql/perf/packer/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/perf/packer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/packer/CMakeLists.txt b/ydb/library/yql/minikql/perf/packer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/perf/packer/CMakeLists.txt
+++ b/ydb/library/yql/minikql/perf/packer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/perf/param/CMakeLists.darwin.txt b/ydb/library/yql/minikql/perf/param/CMakeLists.darwin-x86_64.txt
index e29b663bed..e29b663bed 100644
--- a/ydb/library/yql/minikql/perf/param/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/perf/param/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/param/CMakeLists.linux.txt b/ydb/library/yql/minikql/perf/param/CMakeLists.linux-x86_64.txt
index 447302f9ba..447302f9ba 100644
--- a/ydb/library/yql/minikql/perf/param/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/perf/param/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/param/CMakeLists.txt b/ydb/library/yql/minikql/perf/param/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/perf/param/CMakeLists.txt
+++ b/ydb/library/yql/minikql/perf/param/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/perf/presort/CMakeLists.darwin.txt b/ydb/library/yql/minikql/perf/presort/CMakeLists.darwin-x86_64.txt
index f970850233..f970850233 100644
--- a/ydb/library/yql/minikql/perf/presort/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/perf/presort/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/presort/CMakeLists.linux.txt b/ydb/library/yql/minikql/perf/presort/CMakeLists.linux-x86_64.txt
index d4560b19c2..d4560b19c2 100644
--- a/ydb/library/yql/minikql/perf/presort/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/perf/presort/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/perf/presort/CMakeLists.txt b/ydb/library/yql/minikql/perf/presort/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/perf/presort/CMakeLists.txt
+++ b/ydb/library/yql/minikql/perf/presort/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/minikql/ut/CMakeLists.darwin.txt b/ydb/library/yql/minikql/ut/CMakeLists.darwin-x86_64.txt
index 74f4feaa44..74f4feaa44 100644
--- a/ydb/library/yql/minikql/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/minikql/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/minikql/ut/CMakeLists.linux.txt b/ydb/library/yql/minikql/ut/CMakeLists.linux-x86_64.txt
index f7c15a5f3d..f7c15a5f3d 100644
--- a/ydb/library/yql/minikql/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/minikql/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/minikql/ut/CMakeLists.txt b/ydb/library/yql/minikql/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/minikql/ut/CMakeLists.txt
+++ b/ydb/library/yql/minikql/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/lexer_common/CMakeLists.darwin.txt b/ydb/library/yql/parser/lexer_common/CMakeLists.darwin-x86_64.txt
index 89fc8b0b01..89fc8b0b01 100644
--- a/ydb/library/yql/parser/lexer_common/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/lexer_common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/lexer_common/CMakeLists.linux.txt b/ydb/library/yql/parser/lexer_common/CMakeLists.linux-x86_64.txt
index 040e95b049..040e95b049 100644
--- a/ydb/library/yql/parser/lexer_common/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/lexer_common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/lexer_common/CMakeLists.txt b/ydb/library/yql/parser/lexer_common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/lexer_common/CMakeLists.txt
+++ b/ydb/library/yql/parser/lexer_common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/lexer_common/ut/CMakeLists.darwin.txt b/ydb/library/yql/parser/lexer_common/ut/CMakeLists.darwin-x86_64.txt
index 79ad7b1294..79ad7b1294 100644
--- a/ydb/library/yql/parser/lexer_common/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/lexer_common/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/lexer_common/ut/CMakeLists.linux.txt b/ydb/library/yql/parser/lexer_common/ut/CMakeLists.linux-x86_64.txt
index 1869d8b27c..1869d8b27c 100644
--- a/ydb/library/yql/parser/lexer_common/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/lexer_common/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/lexer_common/ut/CMakeLists.txt b/ydb/library/yql/parser/lexer_common/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/lexer_common/ut/CMakeLists.txt
+++ b/ydb/library/yql/parser/lexer_common/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/pg_catalog/CMakeLists.darwin.txt b/ydb/library/yql/parser/pg_catalog/CMakeLists.darwin-x86_64.txt
index 033098798a..033098798a 100644
--- a/ydb/library/yql/parser/pg_catalog/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/pg_catalog/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_catalog/CMakeLists.linux.txt b/ydb/library/yql/parser/pg_catalog/CMakeLists.linux-x86_64.txt
index a662e4640f..a662e4640f 100644
--- a/ydb/library/yql/parser/pg_catalog/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/pg_catalog/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_catalog/CMakeLists.txt b/ydb/library/yql/parser/pg_catalog/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/pg_catalog/CMakeLists.txt
+++ b/ydb/library/yql/parser/pg_catalog/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.darwin.txt b/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.darwin-x86_64.txt
index 3c37090615..3c37090615 100644
--- a/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.linux.txt b/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.linux-x86_64.txt
index c155bce5d4..c155bce5d4 100644
--- a/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.txt b/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.txt
+++ b/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt
index f43f55d0d8..f43f55d0d8 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt
index a0109f09e9..a0109f09e9 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.darwin.txt b/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.darwin-x86_64.txt
index 39f80d898a..39f80d898a 100644
--- a/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.linux.txt b/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.linux-x86_64.txt
index 34d54d3014..34d54d3014 100644
--- a/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.txt b/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.txt
+++ b/ydb/library/yql/parser/pg_wrapper/interface/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt
index 5e380bcbeb..5e380bcbeb 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt
index 4abc4953e5..4abc4953e5 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/proto_ast/CMakeLists.darwin.txt b/ydb/library/yql/parser/proto_ast/CMakeLists.darwin-x86_64.txt
index aec64b880e..aec64b880e 100644
--- a/ydb/library/yql/parser/proto_ast/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/proto_ast/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/CMakeLists.linux.txt b/ydb/library/yql/parser/proto_ast/CMakeLists.linux-x86_64.txt
index 9eb92dd630..9eb92dd630 100644
--- a/ydb/library/yql/parser/proto_ast/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/proto_ast/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/proto_ast/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.darwin.txt b/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.darwin-x86_64.txt
index a818d5398b..a818d5398b 100644
--- a/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.linux.txt b/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.linux-x86_64.txt
index 05d0648d81..05d0648d81 100644
--- a/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/collect_issues/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.darwin.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.darwin-x86_64.txt
index 65d2f12e2a..65d2f12e2a 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-x86_64.txt
index 9b5df75f59..9b5df75f59 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.darwin.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.darwin-x86_64.txt
index e46562c7d8..e46562c7d8 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-x86_64.txt
index 906f81b5e4..906f81b5e4 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt
index 02b893de3b..02b893de3b 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt
index d1fd41654f..d1fd41654f 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt
index 7ce8f04bcf..7ce8f04bcf 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt
index b0255d7b59..b0255d7b59 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt
index 6e54b1e340..6e54b1e340 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt
index f9c920556c..f9c920556c 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/protos/CMakeLists.darwin.txt b/ydb/library/yql/protos/CMakeLists.darwin-x86_64.txt
index 3bcb29501f..3bcb29501f 100644
--- a/ydb/library/yql/protos/CMakeLists.darwin.txt
+++ b/ydb/library/yql/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/protos/CMakeLists.linux.txt b/ydb/library/yql/protos/CMakeLists.linux-x86_64.txt
index 1ab2ef6b31..1ab2ef6b31 100644
--- a/ydb/library/yql/protos/CMakeLists.linux.txt
+++ b/ydb/library/yql/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/protos/CMakeLists.txt b/ydb/library/yql/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/protos/CMakeLists.txt
+++ b/ydb/library/yql/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/clickhouse/actors/CMakeLists.darwin.txt b/ydb/library/yql/providers/clickhouse/actors/CMakeLists.darwin-x86_64.txt
index 477f1b9131..477f1b9131 100644
--- a/ydb/library/yql/providers/clickhouse/actors/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/clickhouse/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/clickhouse/actors/CMakeLists.linux.txt b/ydb/library/yql/providers/clickhouse/actors/CMakeLists.linux-x86_64.txt
index 9eae5b0a45..9eae5b0a45 100644
--- a/ydb/library/yql/providers/clickhouse/actors/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/clickhouse/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/clickhouse/actors/CMakeLists.txt b/ydb/library/yql/providers/clickhouse/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/clickhouse/actors/CMakeLists.txt
+++ b/ydb/library/yql/providers/clickhouse/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.darwin-x86_64.txt
index 16666cdd9d..16666cdd9d 100644
--- a/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.linux-x86_64.txt
index 03ab381c53..03ab381c53 100644
--- a/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/clickhouse/proto/CMakeLists.darwin.txt b/ydb/library/yql/providers/clickhouse/proto/CMakeLists.darwin-x86_64.txt
index dc1892a574..dc1892a574 100644
--- a/ydb/library/yql/providers/clickhouse/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/clickhouse/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/clickhouse/proto/CMakeLists.linux.txt b/ydb/library/yql/providers/clickhouse/proto/CMakeLists.linux-x86_64.txt
index 026f01786c..026f01786c 100644
--- a/ydb/library/yql/providers/clickhouse/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/clickhouse/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/clickhouse/proto/CMakeLists.txt b/ydb/library/yql/providers/clickhouse/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/clickhouse/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/clickhouse/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.darwin-x86_64.txt
index ca76b1925b..ca76b1925b 100644
--- a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux-x86_64.txt
index 6ac76dbc89..6ac76dbc89 100644
--- a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.txt b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/clickhouse/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/clickhouse/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/activation/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/activation/CMakeLists.darwin-x86_64.txt
index 0ce97d9f09..0ce97d9f09 100644
--- a/ydb/library/yql/providers/common/activation/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/activation/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/activation/CMakeLists.linux.txt b/ydb/library/yql/providers/common/activation/CMakeLists.linux-x86_64.txt
index 8920b07dc6..8920b07dc6 100644
--- a/ydb/library/yql/providers/common/activation/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/activation/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/activation/CMakeLists.txt b/ydb/library/yql/providers/common/activation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/activation/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/activation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/arrow/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/arrow/CMakeLists.darwin-x86_64.txt
index 62172bc6da..62172bc6da 100644
--- a/ydb/library/yql/providers/common/arrow/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/arrow/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/arrow/CMakeLists.linux.txt b/ydb/library/yql/providers/common/arrow/CMakeLists.linux-x86_64.txt
index 88697c69b0..88697c69b0 100644
--- a/ydb/library/yql/providers/common/arrow/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/arrow/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/arrow/CMakeLists.txt b/ydb/library/yql/providers/common/arrow/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/arrow/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/arrow/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/arrow/interface/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/arrow/interface/CMakeLists.darwin-x86_64.txt
index adefcdf8d5..adefcdf8d5 100644
--- a/ydb/library/yql/providers/common/arrow/interface/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/arrow/interface/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/arrow/interface/CMakeLists.linux.txt b/ydb/library/yql/providers/common/arrow/interface/CMakeLists.linux-x86_64.txt
index 35350df995..35350df995 100644
--- a/ydb/library/yql/providers/common/arrow/interface/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/arrow/interface/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/arrow/interface/CMakeLists.txt b/ydb/library/yql/providers/common/arrow/interface/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/arrow/interface/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/arrow/interface/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.darwin-x86_64.txt
index e9de3919a6..e9de3919a6 100644
--- a/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.linux.txt b/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.linux-x86_64.txt
index f53061e8a9..f53061e8a9 100644
--- a/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.txt b/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/arrow_resolve/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/codec/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/codec/CMakeLists.darwin-x86_64.txt
index b91ee468ba..b91ee468ba 100644
--- a/ydb/library/yql/providers/common/codec/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/codec/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/codec/CMakeLists.linux.txt b/ydb/library/yql/providers/common/codec/CMakeLists.linux-x86_64.txt
index c18376b929..c18376b929 100644
--- a/ydb/library/yql/providers/common/codec/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/codec/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/codec/CMakeLists.txt b/ydb/library/yql/providers/common/codec/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/codec/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/codec/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/codec/ut/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/codec/ut/CMakeLists.darwin-x86_64.txt
index eacaebfb6e..eacaebfb6e 100644
--- a/ydb/library/yql/providers/common/codec/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/codec/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/codec/ut/CMakeLists.linux.txt b/ydb/library/yql/providers/common/codec/ut/CMakeLists.linux-x86_64.txt
index 7b0bee1ddc..7b0bee1ddc 100644
--- a/ydb/library/yql/providers/common/codec/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/codec/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/codec/ut/CMakeLists.txt b/ydb/library/yql/providers/common/codec/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/codec/ut/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/codec/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/comp_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/comp_nodes/CMakeLists.darwin-x86_64.txt
index d38b0acd13..d38b0acd13 100644
--- a/ydb/library/yql/providers/common/comp_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/comp_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/comp_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/common/comp_nodes/CMakeLists.linux-x86_64.txt
index b13d46da65..b13d46da65 100644
--- a/ydb/library/yql/providers/common/comp_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/comp_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/comp_nodes/CMakeLists.txt b/ydb/library/yql/providers/common/comp_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/comp_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/comp_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/config/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/config/CMakeLists.darwin-x86_64.txt
index 05788989c4..05788989c4 100644
--- a/ydb/library/yql/providers/common/config/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/config/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/config/CMakeLists.linux.txt b/ydb/library/yql/providers/common/config/CMakeLists.linux-x86_64.txt
index 3dde87c697..3dde87c697 100644
--- a/ydb/library/yql/providers/common/config/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/config/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/config/CMakeLists.txt b/ydb/library/yql/providers/common/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/config/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.darwin-x86_64.txt
index 7bbfc9a4c1..7bbfc9a4c1 100644
--- a/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.linux.txt b/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.linux-x86_64.txt
index 392cc3fcae..392cc3fcae 100644
--- a/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.txt b/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/db_id_async_resolver/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/dq/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/dq/CMakeLists.darwin-x86_64.txt
index 1070128188..1070128188 100644
--- a/ydb/library/yql/providers/common/dq/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/dq/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/dq/CMakeLists.linux.txt b/ydb/library/yql/providers/common/dq/CMakeLists.linux-x86_64.txt
index 3fa3069dbc..3fa3069dbc 100644
--- a/ydb/library/yql/providers/common/dq/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/dq/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/dq/CMakeLists.txt b/ydb/library/yql/providers/common/dq/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/dq/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/dq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/gateway/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/gateway/CMakeLists.darwin-x86_64.txt
index d3d0e1bddf..d3d0e1bddf 100644
--- a/ydb/library/yql/providers/common/gateway/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/gateway/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/gateway/CMakeLists.linux.txt b/ydb/library/yql/providers/common/gateway/CMakeLists.linux-x86_64.txt
index e9f7a10f25..e9f7a10f25 100644
--- a/ydb/library/yql/providers/common/gateway/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/gateway/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/gateway/CMakeLists.txt b/ydb/library/yql/providers/common/gateway/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/gateway/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/gateway/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/http_gateway/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/http_gateway/CMakeLists.darwin-x86_64.txt
index 34c5592024..34c5592024 100644
--- a/ydb/library/yql/providers/common/http_gateway/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/http_gateway/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/http_gateway/CMakeLists.linux.txt b/ydb/library/yql/providers/common/http_gateway/CMakeLists.linux-x86_64.txt
index 5f2df2978a..5f2df2978a 100644
--- a/ydb/library/yql/providers/common/http_gateway/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/http_gateway/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/http_gateway/CMakeLists.txt b/ydb/library/yql/providers/common/http_gateway/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/http_gateway/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/http_gateway/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.darwin-x86_64.txt
index a6953ebd81..a6953ebd81 100644
--- a/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.linux.txt b/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.linux-x86_64.txt
index 8e51bd003e..8e51bd003e 100644
--- a/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.txt b/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/http_gateway/mock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.darwin-x86_64.txt
index 472ffb8163..472ffb8163 100644
--- a/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.linux.txt b/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.linux-x86_64.txt
index c5a0370485..c5a0370485 100644
--- a/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.txt b/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/http_gateway/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/metrics/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/metrics/CMakeLists.darwin-x86_64.txt
index 19966f5689..19966f5689 100644
--- a/ydb/library/yql/providers/common/metrics/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/metrics/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/metrics/CMakeLists.linux.txt b/ydb/library/yql/providers/common/metrics/CMakeLists.linux-x86_64.txt
index 5930a3aff1..5930a3aff1 100644
--- a/ydb/library/yql/providers/common/metrics/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/metrics/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/metrics/CMakeLists.txt b/ydb/library/yql/providers/common/metrics/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/metrics/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/metrics/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/metrics/protos/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/metrics/protos/CMakeLists.darwin-x86_64.txt
index e4138a2b75..e4138a2b75 100644
--- a/ydb/library/yql/providers/common/metrics/protos/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/metrics/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/metrics/protos/CMakeLists.linux.txt b/ydb/library/yql/providers/common/metrics/protos/CMakeLists.linux-x86_64.txt
index 7cf0fa8c6a..7cf0fa8c6a 100644
--- a/ydb/library/yql/providers/common/metrics/protos/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/metrics/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/metrics/protos/CMakeLists.txt b/ydb/library/yql/providers/common/metrics/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/metrics/protos/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/metrics/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/mkql/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/mkql/CMakeLists.darwin-x86_64.txt
index ee01009ed1..ee01009ed1 100644
--- a/ydb/library/yql/providers/common/mkql/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/mkql/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/mkql/CMakeLists.linux.txt b/ydb/library/yql/providers/common/mkql/CMakeLists.linux-x86_64.txt
index 94ae336cc2..94ae336cc2 100644
--- a/ydb/library/yql/providers/common/mkql/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/mkql/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/mkql/CMakeLists.txt b/ydb/library/yql/providers/common/mkql/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/mkql/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/mkql/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/proto/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/proto/CMakeLists.darwin-x86_64.txt
index bf15f57e3f..bf15f57e3f 100644
--- a/ydb/library/yql/providers/common/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/proto/CMakeLists.linux.txt b/ydb/library/yql/providers/common/proto/CMakeLists.linux-x86_64.txt
index f4fc466d36..f4fc466d36 100644
--- a/ydb/library/yql/providers/common/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/proto/CMakeLists.txt b/ydb/library/yql/providers/common/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/provider/CMakeLists.darwin-x86_64.txt
index 8933bfd711..8933bfd711 100644
--- a/ydb/library/yql/providers/common/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/common/provider/CMakeLists.linux-x86_64.txt
index 1573d99d01..1573d99d01 100644
--- a/ydb/library/yql/providers/common/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/provider/CMakeLists.txt b/ydb/library/yql/providers/common/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/schema/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/schema/CMakeLists.darwin-x86_64.txt
index 32c29f0aac..32c29f0aac 100644
--- a/ydb/library/yql/providers/common/schema/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/schema/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/CMakeLists.linux.txt b/ydb/library/yql/providers/common/schema/CMakeLists.linux-x86_64.txt
index 4fc4e4497a..4fc4e4497a 100644
--- a/ydb/library/yql/providers/common/schema/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/schema/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/CMakeLists.txt b/ydb/library/yql/providers/common/schema/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/schema/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/schema/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/schema/expr/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/schema/expr/CMakeLists.darwin-x86_64.txt
index 7101f86cbc..7101f86cbc 100644
--- a/ydb/library/yql/providers/common/schema/expr/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/schema/expr/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/expr/CMakeLists.linux.txt b/ydb/library/yql/providers/common/schema/expr/CMakeLists.linux-x86_64.txt
index aa12ad9989..aa12ad9989 100644
--- a/ydb/library/yql/providers/common/schema/expr/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/schema/expr/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/expr/CMakeLists.txt b/ydb/library/yql/providers/common/schema/expr/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/schema/expr/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/schema/expr/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/schema/mkql/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/schema/mkql/CMakeLists.darwin-x86_64.txt
index 571c1bb96c..571c1bb96c 100644
--- a/ydb/library/yql/providers/common/schema/mkql/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/schema/mkql/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/mkql/CMakeLists.linux.txt b/ydb/library/yql/providers/common/schema/mkql/CMakeLists.linux-x86_64.txt
index 7bb02a9427..7bb02a9427 100644
--- a/ydb/library/yql/providers/common/schema/mkql/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/schema/mkql/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/mkql/CMakeLists.txt b/ydb/library/yql/providers/common/schema/mkql/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/schema/mkql/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/schema/mkql/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/schema/parser/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/schema/parser/CMakeLists.darwin-x86_64.txt
index 0cd7065b24..0cd7065b24 100644
--- a/ydb/library/yql/providers/common/schema/parser/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/schema/parser/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/parser/CMakeLists.linux.txt b/ydb/library/yql/providers/common/schema/parser/CMakeLists.linux-x86_64.txt
index 8e9211dead..8e9211dead 100644
--- a/ydb/library/yql/providers/common/schema/parser/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/schema/parser/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/parser/CMakeLists.txt b/ydb/library/yql/providers/common/schema/parser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/schema/parser/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/schema/parser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/schema/skiff/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/schema/skiff/CMakeLists.darwin-x86_64.txt
index 65e4a025b5..65e4a025b5 100644
--- a/ydb/library/yql/providers/common/schema/skiff/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/schema/skiff/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/skiff/CMakeLists.linux.txt b/ydb/library/yql/providers/common/schema/skiff/CMakeLists.linux-x86_64.txt
index 2fbd3508bc..2fbd3508bc 100644
--- a/ydb/library/yql/providers/common/schema/skiff/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/schema/skiff/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/schema/skiff/CMakeLists.txt b/ydb/library/yql/providers/common/schema/skiff/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/schema/skiff/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/schema/skiff/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/structured_token/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/structured_token/CMakeLists.darwin-x86_64.txt
index 75b84199aa..75b84199aa 100644
--- a/ydb/library/yql/providers/common/structured_token/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/structured_token/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/structured_token/CMakeLists.linux.txt b/ydb/library/yql/providers/common/structured_token/CMakeLists.linux-x86_64.txt
index 6c23ea4575..6c23ea4575 100644
--- a/ydb/library/yql/providers/common/structured_token/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/structured_token/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/structured_token/CMakeLists.txt b/ydb/library/yql/providers/common/structured_token/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/structured_token/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/structured_token/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.darwin-x86_64.txt
index eda13098a5..eda13098a5 100644
--- a/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.linux.txt b/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.linux-x86_64.txt
index 77ae6026c0..77ae6026c0 100644
--- a/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.txt b/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.darwin-x86_64.txt
index 74fa102d25..74fa102d25 100644
--- a/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.linux.txt b/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.linux-x86_64.txt
index 40eff928f3..40eff928f3 100644
--- a/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.txt b/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/token_accessor/client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.darwin-x86_64.txt
index b1ce956e1c..b1ce956e1c 100644
--- a/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.linux.txt b/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.linux-x86_64.txt
index 9b5a78a1df..9b5a78a1df 100644
--- a/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.txt b/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/token_accessor/grpc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/transform/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/transform/CMakeLists.darwin-x86_64.txt
index 0deb002e02..0deb002e02 100644
--- a/ydb/library/yql/providers/common/transform/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/transform/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/transform/CMakeLists.linux.txt b/ydb/library/yql/providers/common/transform/CMakeLists.linux-x86_64.txt
index f568eee600..f568eee600 100644
--- a/ydb/library/yql/providers/common/transform/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/transform/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/transform/CMakeLists.txt b/ydb/library/yql/providers/common/transform/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/transform/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/transform/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/udf_resolve/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/udf_resolve/CMakeLists.darwin-x86_64.txt
index cd09e608e6..cd09e608e6 100644
--- a/ydb/library/yql/providers/common/udf_resolve/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/udf_resolve/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/udf_resolve/CMakeLists.linux.txt b/ydb/library/yql/providers/common/udf_resolve/CMakeLists.linux-x86_64.txt
index d9beed0ae5..d9beed0ae5 100644
--- a/ydb/library/yql/providers/common/udf_resolve/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/udf_resolve/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/udf_resolve/CMakeLists.txt b/ydb/library/yql/providers/common/udf_resolve/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/udf_resolve/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/udf_resolve/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/common/ut_helpers/CMakeLists.darwin.txt b/ydb/library/yql/providers/common/ut_helpers/CMakeLists.darwin-x86_64.txt
index af4500f492..af4500f492 100644
--- a/ydb/library/yql/providers/common/ut_helpers/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/common/ut_helpers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/common/ut_helpers/CMakeLists.linux.txt b/ydb/library/yql/providers/common/ut_helpers/CMakeLists.linux-x86_64.txt
index 6bdcb3a5d1..6bdcb3a5d1 100644
--- a/ydb/library/yql/providers/common/ut_helpers/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/common/ut_helpers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/common/ut_helpers/CMakeLists.txt b/ydb/library/yql/providers/common/ut_helpers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/common/ut_helpers/CMakeLists.txt
+++ b/ydb/library/yql/providers/common/ut_helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/config/CMakeLists.darwin.txt b/ydb/library/yql/providers/config/CMakeLists.darwin-x86_64.txt
index d2daa2064b..d2daa2064b 100644
--- a/ydb/library/yql/providers/config/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/config/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/config/CMakeLists.linux.txt b/ydb/library/yql/providers/config/CMakeLists.linux-x86_64.txt
index acfd736aac..acfd736aac 100644
--- a/ydb/library/yql/providers/config/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/config/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/config/CMakeLists.txt b/ydb/library/yql/providers/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/config/CMakeLists.txt
+++ b/ydb/library/yql/providers/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/actors/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/actors/CMakeLists.darwin-x86_64.txt
index 1812c2a185..1812c2a185 100644
--- a/ydb/library/yql/providers/dq/actors/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/actors/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/actors/CMakeLists.linux-x86_64.txt
index 7139fa2fbf..7139fa2fbf 100644
--- a/ydb/library/yql/providers/dq/actors/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/actors/CMakeLists.txt b/ydb/library/yql/providers/dq/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/actors/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/actors/ut/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/actors/ut/CMakeLists.darwin-x86_64.txt
index 41a6fa2962..41a6fa2962 100644
--- a/ydb/library/yql/providers/dq/actors/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/actors/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/actors/ut/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/actors/ut/CMakeLists.linux-x86_64.txt
index 337587c082..337587c082 100644
--- a/ydb/library/yql/providers/dq/actors/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/actors/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/actors/ut/CMakeLists.txt b/ydb/library/yql/providers/dq/actors/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/actors/ut/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/actors/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/api/grpc/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/api/grpc/CMakeLists.darwin-x86_64.txt
index bead812e5a..bead812e5a 100644
--- a/ydb/library/yql/providers/dq/api/grpc/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/api/grpc/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/api/grpc/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/api/grpc/CMakeLists.linux-x86_64.txt
index 85e3fb1fc1..85e3fb1fc1 100644
--- a/ydb/library/yql/providers/dq/api/grpc/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/api/grpc/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/api/grpc/CMakeLists.txt b/ydb/library/yql/providers/dq/api/grpc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/api/grpc/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/api/grpc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/api/protos/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/api/protos/CMakeLists.darwin-x86_64.txt
index 6daf35e61f..6daf35e61f 100644
--- a/ydb/library/yql/providers/dq/api/protos/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/api/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/api/protos/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/api/protos/CMakeLists.linux-x86_64.txt
index 057ea9a69d..057ea9a69d 100644
--- a/ydb/library/yql/providers/dq/api/protos/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/api/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/api/protos/CMakeLists.txt b/ydb/library/yql/providers/dq/api/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/api/protos/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/api/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/common/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/common/CMakeLists.darwin-x86_64.txt
index d0bddb4ea8..d0bddb4ea8 100644
--- a/ydb/library/yql/providers/dq/common/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/common/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/common/CMakeLists.linux-x86_64.txt
index 0b477b8c2e..0b477b8c2e 100644
--- a/ydb/library/yql/providers/dq/common/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/common/CMakeLists.txt b/ydb/library/yql/providers/dq/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/common/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/config/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/config/CMakeLists.darwin-x86_64.txt
index 67633d6000..67633d6000 100644
--- a/ydb/library/yql/providers/dq/config/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/config/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/config/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/config/CMakeLists.linux-x86_64.txt
index 6081a00e96..6081a00e96 100644
--- a/ydb/library/yql/providers/dq/config/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/config/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/config/CMakeLists.txt b/ydb/library/yql/providers/dq/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/config/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/counters/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/counters/CMakeLists.darwin-x86_64.txt
index 3f0ba79d39..3f0ba79d39 100644
--- a/ydb/library/yql/providers/dq/counters/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/counters/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/counters/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/counters/CMakeLists.linux-x86_64.txt
index 3879ce3cf0..3879ce3cf0 100644
--- a/ydb/library/yql/providers/dq/counters/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/counters/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/counters/CMakeLists.txt b/ydb/library/yql/providers/dq/counters/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/counters/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/counters/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.darwin-x86_64.txt
index 7aba0afce6..7aba0afce6 100644
--- a/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.linux-x86_64.txt
index aa3ec454d1..aa3ec454d1 100644
--- a/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/interface/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/interface/CMakeLists.darwin-x86_64.txt
index 2caf1879a6..2caf1879a6 100644
--- a/ydb/library/yql/providers/dq/interface/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/interface/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/interface/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/interface/CMakeLists.linux-x86_64.txt
index a8b43ce805..a8b43ce805 100644
--- a/ydb/library/yql/providers/dq/interface/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/interface/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/interface/CMakeLists.txt b/ydb/library/yql/providers/dq/interface/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/interface/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/interface/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/mkql/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/mkql/CMakeLists.darwin-x86_64.txt
index f7fdd5de4d..f7fdd5de4d 100644
--- a/ydb/library/yql/providers/dq/mkql/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/mkql/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/mkql/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/mkql/CMakeLists.linux-x86_64.txt
index 8fb2cb0308..8fb2cb0308 100644
--- a/ydb/library/yql/providers/dq/mkql/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/mkql/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/mkql/CMakeLists.txt b/ydb/library/yql/providers/dq/mkql/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/mkql/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/mkql/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/opt/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/opt/CMakeLists.darwin-x86_64.txt
index 80b7547390..80b7547390 100644
--- a/ydb/library/yql/providers/dq/opt/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/opt/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/opt/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/opt/CMakeLists.linux-x86_64.txt
index 9ca8a3c321..9ca8a3c321 100644
--- a/ydb/library/yql/providers/dq/opt/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/opt/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/opt/CMakeLists.txt b/ydb/library/yql/providers/dq/opt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/opt/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/opt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/planner/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/planner/CMakeLists.darwin-x86_64.txt
index 43bf8a5a1c..43bf8a5a1c 100644
--- a/ydb/library/yql/providers/dq/planner/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/planner/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/planner/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/planner/CMakeLists.linux-x86_64.txt
index e22eae8530..e22eae8530 100644
--- a/ydb/library/yql/providers/dq/planner/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/planner/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/planner/CMakeLists.txt b/ydb/library/yql/providers/dq/planner/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/planner/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/planner/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/provider/CMakeLists.darwin-x86_64.txt
index 768e169134..768e169134 100644
--- a/ydb/library/yql/providers/dq/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/provider/CMakeLists.linux-x86_64.txt
index 29597b8d61..29597b8d61 100644
--- a/ydb/library/yql/providers/dq/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/provider/CMakeLists.txt b/ydb/library/yql/providers/dq/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.darwin-x86_64.txt
index 3360a34a23..3360a34a23 100644
--- a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux-x86_64.txt
index e56ec01d4c..e56ec01d4c 100644
--- a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.txt b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/provider/exec/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/provider/exec/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/runtime/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/runtime/CMakeLists.darwin-x86_64.txt
index 5e00399735..5e00399735 100644
--- a/ydb/library/yql/providers/dq/runtime/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/runtime/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/runtime/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/runtime/CMakeLists.linux-x86_64.txt
index 3b44c0c270..3b44c0c270 100644
--- a/ydb/library/yql/providers/dq/runtime/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/runtime/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/runtime/CMakeLists.txt b/ydb/library/yql/providers/dq/runtime/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/runtime/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/runtime/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/task_runner/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/task_runner/CMakeLists.darwin-x86_64.txt
index 1ca5d50b77..1ca5d50b77 100644
--- a/ydb/library/yql/providers/dq/task_runner/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/task_runner/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux-x86_64.txt
index a81fb238aa..a81fb238aa 100644
--- a/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/task_runner/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/task_runner/CMakeLists.txt b/ydb/library/yql/providers/dq/task_runner/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/task_runner/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/task_runner/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.darwin-x86_64.txt
index f93dd43600..f93dd43600 100644
--- a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux-x86_64.txt
index 765d66b19e..765d66b19e 100644
--- a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.txt b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/task_runner_actor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.darwin-x86_64.txt
index 3980bbc31c..3980bbc31c 100644
--- a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-x86_64.txt
index c6e00e7373..c6e00e7373 100644
--- a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.txt b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/worker_manager/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/worker_manager/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.darwin.txt b/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.darwin-x86_64.txt
index 9dc0d87b63..9dc0d87b63 100644
--- a/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.linux.txt b/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.linux-x86_64.txt
index aabe835f2c..aabe835f2c 100644
--- a/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.txt b/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/worker_manager/interface/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/function/common/CMakeLists.darwin.txt b/ydb/library/yql/providers/function/common/CMakeLists.darwin-x86_64.txt
index 302752a2bd..302752a2bd 100644
--- a/ydb/library/yql/providers/function/common/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/function/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/function/common/CMakeLists.linux.txt b/ydb/library/yql/providers/function/common/CMakeLists.linux-x86_64.txt
index 5d4345c0a1..5d4345c0a1 100644
--- a/ydb/library/yql/providers/function/common/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/function/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/function/common/CMakeLists.txt b/ydb/library/yql/providers/function/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/function/common/CMakeLists.txt
+++ b/ydb/library/yql/providers/function/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/function/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/function/expr_nodes/CMakeLists.darwin-x86_64.txt
index 7dd678e97a..7dd678e97a 100644
--- a/ydb/library/yql/providers/function/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/function/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/function/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/function/expr_nodes/CMakeLists.linux-x86_64.txt
index c8d502305a..c8d502305a 100644
--- a/ydb/library/yql/providers/function/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/function/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/function/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/function/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/function/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/function/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/function/gateway/CMakeLists.darwin.txt b/ydb/library/yql/providers/function/gateway/CMakeLists.darwin-x86_64.txt
index 8988089abc..8988089abc 100644
--- a/ydb/library/yql/providers/function/gateway/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/function/gateway/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/function/gateway/CMakeLists.linux.txt b/ydb/library/yql/providers/function/gateway/CMakeLists.linux-x86_64.txt
index 9c78fa8452..9c78fa8452 100644
--- a/ydb/library/yql/providers/function/gateway/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/function/gateway/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/function/gateway/CMakeLists.txt b/ydb/library/yql/providers/function/gateway/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/function/gateway/CMakeLists.txt
+++ b/ydb/library/yql/providers/function/gateway/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/function/proto/CMakeLists.darwin.txt b/ydb/library/yql/providers/function/proto/CMakeLists.darwin-x86_64.txt
index 4e85a89b0d..4e85a89b0d 100644
--- a/ydb/library/yql/providers/function/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/function/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/function/proto/CMakeLists.linux.txt b/ydb/library/yql/providers/function/proto/CMakeLists.linux-x86_64.txt
index 76e1dd4a96..76e1dd4a96 100644
--- a/ydb/library/yql/providers/function/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/function/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/function/proto/CMakeLists.txt b/ydb/library/yql/providers/function/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/function/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/function/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/function/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/function/provider/CMakeLists.darwin-x86_64.txt
index 0ef405d0d9..0ef405d0d9 100644
--- a/ydb/library/yql/providers/function/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/function/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/function/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/function/provider/CMakeLists.linux-x86_64.txt
index bcc8d80873..bcc8d80873 100644
--- a/ydb/library/yql/providers/function/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/function/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/function/provider/CMakeLists.txt b/ydb/library/yql/providers/function/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/function/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/function/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/async_io/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/async_io/CMakeLists.darwin-x86_64.txt
index c4a76c1610..c4a76c1610 100644
--- a/ydb/library/yql/providers/pq/async_io/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/async_io/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/async_io/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/async_io/CMakeLists.linux-x86_64.txt
index 84f89136be..84f89136be 100644
--- a/ydb/library/yql/providers/pq/async_io/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/async_io/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/async_io/CMakeLists.txt b/ydb/library/yql/providers/pq/async_io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/async_io/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/async_io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/cm_client/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/cm_client/CMakeLists.darwin-x86_64.txt
index 6ae222071f..6ae222071f 100644
--- a/ydb/library/yql/providers/pq/cm_client/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/cm_client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/cm_client/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/cm_client/CMakeLists.linux-x86_64.txt
index ce02fb51de..ce02fb51de 100644
--- a/ydb/library/yql/providers/pq/cm_client/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/cm_client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/cm_client/CMakeLists.txt b/ydb/library/yql/providers/pq/cm_client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/cm_client/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/cm_client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/common/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/common/CMakeLists.darwin-x86_64.txt
index 1607a5cc4f..1607a5cc4f 100644
--- a/ydb/library/yql/providers/pq/common/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/common/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/common/CMakeLists.linux-x86_64.txt
index 586b684fb9..586b684fb9 100644
--- a/ydb/library/yql/providers/pq/common/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/common/CMakeLists.txt b/ydb/library/yql/providers/pq/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/common/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.darwin-x86_64.txt
index 7be05df4a3..7be05df4a3 100644
--- a/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.linux-x86_64.txt
index 3c61e41263..3c61e41263 100644
--- a/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.darwin-x86_64.txt
index 6e80e544ea..6e80e544ea 100644
--- a/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.linux-x86_64.txt
index f537bdb22a..f537bdb22a 100644
--- a/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.txt b/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/gateway/dummy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/gateway/native/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/gateway/native/CMakeLists.darwin-x86_64.txt
index da671c9455..da671c9455 100644
--- a/ydb/library/yql/providers/pq/gateway/native/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/gateway/native/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/gateway/native/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/gateway/native/CMakeLists.linux-x86_64.txt
index bddd7a24ed..bddd7a24ed 100644
--- a/ydb/library/yql/providers/pq/gateway/native/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/gateway/native/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/gateway/native/CMakeLists.txt b/ydb/library/yql/providers/pq/gateway/native/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/gateway/native/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/gateway/native/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/proto/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/proto/CMakeLists.darwin-x86_64.txt
index 0ecfcba40b..0ecfcba40b 100644
--- a/ydb/library/yql/providers/pq/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/proto/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/proto/CMakeLists.linux-x86_64.txt
index 146b3d1aa8..146b3d1aa8 100644
--- a/ydb/library/yql/providers/pq/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/proto/CMakeLists.txt b/ydb/library/yql/providers/pq/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/provider/CMakeLists.darwin-x86_64.txt
index 3a6bc45d3b..3a6bc45d3b 100644
--- a/ydb/library/yql/providers/pq/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/provider/CMakeLists.linux-x86_64.txt
index d0ad269949..d0ad269949 100644
--- a/ydb/library/yql/providers/pq/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/provider/CMakeLists.txt b/ydb/library/yql/providers/pq/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/pq/task_meta/CMakeLists.darwin.txt b/ydb/library/yql/providers/pq/task_meta/CMakeLists.darwin-x86_64.txt
index a64f264b35..a64f264b35 100644
--- a/ydb/library/yql/providers/pq/task_meta/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/pq/task_meta/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/task_meta/CMakeLists.linux.txt b/ydb/library/yql/providers/pq/task_meta/CMakeLists.linux-x86_64.txt
index dc58176ac8..dc58176ac8 100644
--- a/ydb/library/yql/providers/pq/task_meta/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/pq/task_meta/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/pq/task_meta/CMakeLists.txt b/ydb/library/yql/providers/pq/task_meta/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/pq/task_meta/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/task_meta/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/result/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/result/expr_nodes/CMakeLists.darwin-x86_64.txt
index ea7eea1b5c..ea7eea1b5c 100644
--- a/ydb/library/yql/providers/result/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/result/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/result/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/result/expr_nodes/CMakeLists.linux-x86_64.txt
index 9f87a9aa62..9f87a9aa62 100644
--- a/ydb/library/yql/providers/result/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/result/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/result/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/result/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/result/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/result/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/result/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/result/provider/CMakeLists.darwin-x86_64.txt
index 4fd2b545af..4fd2b545af 100644
--- a/ydb/library/yql/providers/result/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/result/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/result/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/result/provider/CMakeLists.linux-x86_64.txt
index 03a6a5058b..03a6a5058b 100644
--- a/ydb/library/yql/providers/result/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/result/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/result/provider/CMakeLists.txt b/ydb/library/yql/providers/result/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/result/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/result/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/actors/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/actors/CMakeLists.darwin-x86_64.txt
index aa908c5da1..aa908c5da1 100644
--- a/ydb/library/yql/providers/s3/actors/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/actors/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/actors/CMakeLists.linux-x86_64.txt
index 387fada651..387fada651 100644
--- a/ydb/library/yql/providers/s3/actors/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/actors/CMakeLists.txt b/ydb/library/yql/providers/s3/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/actors/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/common/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/common/CMakeLists.darwin-x86_64.txt
index 3901547d5d..3901547d5d 100644
--- a/ydb/library/yql/providers/s3/common/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/common/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/common/CMakeLists.linux-x86_64.txt
index 806a467a7f..806a467a7f 100644
--- a/ydb/library/yql/providers/s3/common/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/common/CMakeLists.txt b/ydb/library/yql/providers/s3/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/common/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/compressors/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/compressors/CMakeLists.darwin-x86_64.txt
index 687d9330bd..687d9330bd 100644
--- a/ydb/library/yql/providers/s3/compressors/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/compressors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/compressors/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/compressors/CMakeLists.linux-x86_64.txt
index 55350bf2db..55350bf2db 100644
--- a/ydb/library/yql/providers/s3/compressors/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/compressors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/compressors/CMakeLists.txt b/ydb/library/yql/providers/s3/compressors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/compressors/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/compressors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.darwin-x86_64.txt
index b710ed0a9f..b710ed0a9f 100644
--- a/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.linux-x86_64.txt
index 57cfefbe9d..57cfefbe9d 100644
--- a/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/object_listers/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/object_listers/CMakeLists.darwin-x86_64.txt
index 7188435f83..7188435f83 100644
--- a/ydb/library/yql/providers/s3/object_listers/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/object_listers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/object_listers/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/object_listers/CMakeLists.linux-x86_64.txt
index 2b11109c92..2b11109c92 100644
--- a/ydb/library/yql/providers/s3/object_listers/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/object_listers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/object_listers/CMakeLists.txt b/ydb/library/yql/providers/s3/object_listers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/object_listers/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/object_listers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/path_generator/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/path_generator/CMakeLists.darwin-x86_64.txt
index 060b60bc71..060b60bc71 100644
--- a/ydb/library/yql/providers/s3/path_generator/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/path_generator/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/path_generator/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/path_generator/CMakeLists.linux-x86_64.txt
index 957f248b5d..957f248b5d 100644
--- a/ydb/library/yql/providers/s3/path_generator/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/path_generator/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/path_generator/CMakeLists.txt b/ydb/library/yql/providers/s3/path_generator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/path_generator/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/path_generator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.darwin-x86_64.txt
index 5c54702532..5c54702532 100644
--- a/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.linux-x86_64.txt
index 39a75d67f4..39a75d67f4 100644
--- a/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.txt b/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/proto/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/proto/CMakeLists.darwin-x86_64.txt
index 571cccfedb..571cccfedb 100644
--- a/ydb/library/yql/providers/s3/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/proto/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/proto/CMakeLists.linux-x86_64.txt
index d64c572d11..d64c572d11 100644
--- a/ydb/library/yql/providers/s3/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/proto/CMakeLists.txt b/ydb/library/yql/providers/s3/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/provider/CMakeLists.darwin-x86_64.txt
index 73c17ce754..73c17ce754 100644
--- a/ydb/library/yql/providers/s3/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/provider/CMakeLists.linux-x86_64.txt
index 50fe0185f0..50fe0185f0 100644
--- a/ydb/library/yql/providers/s3/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/provider/CMakeLists.txt b/ydb/library/yql/providers/s3/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/provider/ut/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/provider/ut/CMakeLists.darwin-x86_64.txt
index 9647ab029a..9647ab029a 100644
--- a/ydb/library/yql/providers/s3/provider/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/provider/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/provider/ut/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/provider/ut/CMakeLists.linux-x86_64.txt
index 1cdb1de1d3..1cdb1de1d3 100644
--- a/ydb/library/yql/providers/s3/provider/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/provider/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/provider/ut/CMakeLists.txt b/ydb/library/yql/providers/s3/provider/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/provider/ut/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/provider/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/range_helpers/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/range_helpers/CMakeLists.darwin-x86_64.txt
index 0827227867..0827227867 100644
--- a/ydb/library/yql/providers/s3/range_helpers/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/range_helpers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/range_helpers/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/range_helpers/CMakeLists.linux-x86_64.txt
index e18c581c62..e18c581c62 100644
--- a/ydb/library/yql/providers/s3/range_helpers/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/range_helpers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/range_helpers/CMakeLists.txt b/ydb/library/yql/providers/s3/range_helpers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/range_helpers/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/range_helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.darwin-x86_64.txt
index 6aaf170055..6aaf170055 100644
--- a/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.linux-x86_64.txt
index 95058e6fb1..95058e6fb1 100644
--- a/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.txt b/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/range_helpers/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/s3/serializations/CMakeLists.darwin.txt b/ydb/library/yql/providers/s3/serializations/CMakeLists.darwin-x86_64.txt
index f2d21c30ef..f2d21c30ef 100644
--- a/ydb/library/yql/providers/s3/serializations/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/s3/serializations/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/serializations/CMakeLists.linux.txt b/ydb/library/yql/providers/s3/serializations/CMakeLists.linux-x86_64.txt
index 510cc4384e..510cc4384e 100644
--- a/ydb/library/yql/providers/s3/serializations/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/s3/serializations/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/s3/serializations/CMakeLists.txt b/ydb/library/yql/providers/s3/serializations/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/s3/serializations/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/serializations/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/solomon/async_io/CMakeLists.darwin.txt b/ydb/library/yql/providers/solomon/async_io/CMakeLists.darwin-x86_64.txt
index 57efac1991..57efac1991 100644
--- a/ydb/library/yql/providers/solomon/async_io/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/solomon/async_io/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/async_io/CMakeLists.linux.txt b/ydb/library/yql/providers/solomon/async_io/CMakeLists.linux-x86_64.txt
index 1b57f1fce3..1b57f1fce3 100644
--- a/ydb/library/yql/providers/solomon/async_io/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/solomon/async_io/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/async_io/CMakeLists.txt b/ydb/library/yql/providers/solomon/async_io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/solomon/async_io/CMakeLists.txt
+++ b/ydb/library/yql/providers/solomon/async_io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.darwin-x86_64.txt
index 540c22ed8f..540c22ed8f 100644
--- a/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.linux-x86_64.txt
index a3797cbf52..a3797cbf52 100644
--- a/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/solomon/gateway/CMakeLists.darwin.txt b/ydb/library/yql/providers/solomon/gateway/CMakeLists.darwin-x86_64.txt
index 50220485d7..50220485d7 100644
--- a/ydb/library/yql/providers/solomon/gateway/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/solomon/gateway/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/gateway/CMakeLists.linux.txt b/ydb/library/yql/providers/solomon/gateway/CMakeLists.linux-x86_64.txt
index eae2e66f95..eae2e66f95 100644
--- a/ydb/library/yql/providers/solomon/gateway/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/solomon/gateway/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/gateway/CMakeLists.txt b/ydb/library/yql/providers/solomon/gateway/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/solomon/gateway/CMakeLists.txt
+++ b/ydb/library/yql/providers/solomon/gateway/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/solomon/proto/CMakeLists.darwin.txt b/ydb/library/yql/providers/solomon/proto/CMakeLists.darwin-x86_64.txt
index b5ca6a669d..b5ca6a669d 100644
--- a/ydb/library/yql/providers/solomon/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/solomon/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/proto/CMakeLists.linux.txt b/ydb/library/yql/providers/solomon/proto/CMakeLists.linux-x86_64.txt
index 3b4b86fc9b..3b4b86fc9b 100644
--- a/ydb/library/yql/providers/solomon/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/solomon/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/proto/CMakeLists.txt b/ydb/library/yql/providers/solomon/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/solomon/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/solomon/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/solomon/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/solomon/provider/CMakeLists.darwin-x86_64.txt
index 03f51c5c1e..03f51c5c1e 100644
--- a/ydb/library/yql/providers/solomon/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/solomon/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/solomon/provider/CMakeLists.linux-x86_64.txt
index ed8c26d47e..ed8c26d47e 100644
--- a/ydb/library/yql/providers/solomon/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/solomon/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/solomon/provider/CMakeLists.txt b/ydb/library/yql/providers/solomon/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/solomon/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/solomon/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/ydb/actors/CMakeLists.darwin.txt b/ydb/library/yql/providers/ydb/actors/CMakeLists.darwin-x86_64.txt
index 99a5cab4b5..99a5cab4b5 100644
--- a/ydb/library/yql/providers/ydb/actors/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/ydb/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/actors/CMakeLists.linux.txt b/ydb/library/yql/providers/ydb/actors/CMakeLists.linux-x86_64.txt
index 3f650874fa..3f650874fa 100644
--- a/ydb/library/yql/providers/ydb/actors/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/ydb/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/actors/CMakeLists.txt b/ydb/library/yql/providers/ydb/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/ydb/actors/CMakeLists.txt
+++ b/ydb/library/yql/providers/ydb/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.darwin-x86_64.txt
index 788f3db081..788f3db081 100644
--- a/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.linux-x86_64.txt
index 498b294a44..498b294a44 100644
--- a/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.txt b/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/ydb/comp_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.darwin.txt b/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.darwin-x86_64.txt
index 99d4c2103a..99d4c2103a 100644
--- a/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.linux.txt b/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.linux-x86_64.txt
index 48a5c5cc29..48a5c5cc29 100644
--- a/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/ydb/proto/CMakeLists.darwin.txt b/ydb/library/yql/providers/ydb/proto/CMakeLists.darwin-x86_64.txt
index 43eb51761d..43eb51761d 100644
--- a/ydb/library/yql/providers/ydb/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/ydb/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/proto/CMakeLists.linux.txt b/ydb/library/yql/providers/ydb/proto/CMakeLists.linux-x86_64.txt
index 0718849216..0718849216 100644
--- a/ydb/library/yql/providers/ydb/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/ydb/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/proto/CMakeLists.txt b/ydb/library/yql/providers/ydb/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/ydb/proto/CMakeLists.txt
+++ b/ydb/library/yql/providers/ydb/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/ydb/provider/CMakeLists.darwin.txt b/ydb/library/yql/providers/ydb/provider/CMakeLists.darwin-x86_64.txt
index bfd7474921..bfd7474921 100644
--- a/ydb/library/yql/providers/ydb/provider/CMakeLists.darwin.txt
+++ b/ydb/library/yql/providers/ydb/provider/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/provider/CMakeLists.linux.txt b/ydb/library/yql/providers/ydb/provider/CMakeLists.linux-x86_64.txt
index f849a5b064..f849a5b064 100644
--- a/ydb/library/yql/providers/ydb/provider/CMakeLists.linux.txt
+++ b/ydb/library/yql/providers/ydb/provider/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/providers/ydb/provider/CMakeLists.txt b/ydb/library/yql/providers/ydb/provider/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/providers/ydb/provider/CMakeLists.txt
+++ b/ydb/library/yql/providers/ydb/provider/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/decimal/CMakeLists.darwin.txt b/ydb/library/yql/public/decimal/CMakeLists.darwin-x86_64.txt
index f63cbd1d01..f63cbd1d01 100644
--- a/ydb/library/yql/public/decimal/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/decimal/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/decimal/CMakeLists.linux.txt b/ydb/library/yql/public/decimal/CMakeLists.linux-x86_64.txt
index 1d7ff6d8fb..1d7ff6d8fb 100644
--- a/ydb/library/yql/public/decimal/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/decimal/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/decimal/CMakeLists.txt b/ydb/library/yql/public/decimal/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/decimal/CMakeLists.txt
+++ b/ydb/library/yql/public/decimal/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/decimal/ut/CMakeLists.darwin.txt b/ydb/library/yql/public/decimal/ut/CMakeLists.darwin-x86_64.txt
index 2e56e55a3b..2e56e55a3b 100644
--- a/ydb/library/yql/public/decimal/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/decimal/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/decimal/ut/CMakeLists.linux.txt b/ydb/library/yql/public/decimal/ut/CMakeLists.linux-x86_64.txt
index f0782f78ae..f0782f78ae 100644
--- a/ydb/library/yql/public/decimal/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/decimal/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/decimal/ut/CMakeLists.txt b/ydb/library/yql/public/decimal/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/decimal/ut/CMakeLists.txt
+++ b/ydb/library/yql/public/decimal/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/issue/CMakeLists.darwin.txt b/ydb/library/yql/public/issue/CMakeLists.darwin-x86_64.txt
index 33f3dd529d..33f3dd529d 100644
--- a/ydb/library/yql/public/issue/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/issue/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/issue/CMakeLists.linux.txt b/ydb/library/yql/public/issue/CMakeLists.linux-x86_64.txt
index e8f21a2f36..e8f21a2f36 100644
--- a/ydb/library/yql/public/issue/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/issue/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/issue/CMakeLists.txt b/ydb/library/yql/public/issue/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/issue/CMakeLists.txt
+++ b/ydb/library/yql/public/issue/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/issue/protos/CMakeLists.darwin.txt b/ydb/library/yql/public/issue/protos/CMakeLists.darwin-x86_64.txt
index bacc602d98..bacc602d98 100644
--- a/ydb/library/yql/public/issue/protos/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/issue/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/issue/protos/CMakeLists.linux.txt b/ydb/library/yql/public/issue/protos/CMakeLists.linux-x86_64.txt
index d56790b5b0..d56790b5b0 100644
--- a/ydb/library/yql/public/issue/protos/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/issue/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/issue/protos/CMakeLists.txt b/ydb/library/yql/public/issue/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/issue/protos/CMakeLists.txt
+++ b/ydb/library/yql/public/issue/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/issue/ut/CMakeLists.darwin.txt b/ydb/library/yql/public/issue/ut/CMakeLists.darwin-x86_64.txt
index f1ab28c1f8..f1ab28c1f8 100644
--- a/ydb/library/yql/public/issue/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/issue/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/issue/ut/CMakeLists.linux.txt b/ydb/library/yql/public/issue/ut/CMakeLists.linux-x86_64.txt
index 666b5d7621..666b5d7621 100644
--- a/ydb/library/yql/public/issue/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/issue/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/issue/ut/CMakeLists.txt b/ydb/library/yql/public/issue/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/issue/ut/CMakeLists.txt
+++ b/ydb/library/yql/public/issue/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/types/CMakeLists.darwin.txt b/ydb/library/yql/public/types/CMakeLists.darwin-x86_64.txt
index 6af082dd57..6af082dd57 100644
--- a/ydb/library/yql/public/types/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/types/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/types/CMakeLists.linux.txt b/ydb/library/yql/public/types/CMakeLists.linux-x86_64.txt
index 9f51523b7d..9f51523b7d 100644
--- a/ydb/library/yql/public/types/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/types/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/types/CMakeLists.txt b/ydb/library/yql/public/types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/types/CMakeLists.txt
+++ b/ydb/library/yql/public/types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/udf/CMakeLists.darwin.txt b/ydb/library/yql/public/udf/CMakeLists.darwin-x86_64.txt
index fbdaa1df7c..fbdaa1df7c 100644
--- a/ydb/library/yql/public/udf/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/udf/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/udf/CMakeLists.linux.txt b/ydb/library/yql/public/udf/CMakeLists.linux-x86_64.txt
index 32b31cde2d..32b31cde2d 100644
--- a/ydb/library/yql/public/udf/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/udf/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/udf/CMakeLists.txt b/ydb/library/yql/public/udf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/udf/CMakeLists.txt
+++ b/ydb/library/yql/public/udf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/udf/arrow/CMakeLists.darwin.txt b/ydb/library/yql/public/udf/arrow/CMakeLists.darwin-x86_64.txt
index 1b41c0f06e..1b41c0f06e 100644
--- a/ydb/library/yql/public/udf/arrow/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/udf/arrow/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/udf/arrow/CMakeLists.linux.txt b/ydb/library/yql/public/udf/arrow/CMakeLists.linux-x86_64.txt
index 59ba7f2932..59ba7f2932 100644
--- a/ydb/library/yql/public/udf/arrow/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/udf/arrow/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/udf/arrow/CMakeLists.txt b/ydb/library/yql/public/udf/arrow/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/udf/arrow/CMakeLists.txt
+++ b/ydb/library/yql/public/udf/arrow/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.darwin.txt b/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.darwin-x86_64.txt
index c0011de5e5..c0011de5e5 100644
--- a/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.linux.txt b/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.linux-x86_64.txt
index 6481ad2022..6481ad2022 100644
--- a/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.txt b/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.txt
+++ b/ydb/library/yql/public/udf/service/exception_policy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/udf/service/stub/CMakeLists.darwin.txt b/ydb/library/yql/public/udf/service/stub/CMakeLists.darwin-x86_64.txt
index dca6cc3d42..dca6cc3d42 100644
--- a/ydb/library/yql/public/udf/service/stub/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/udf/service/stub/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/udf/service/stub/CMakeLists.linux.txt b/ydb/library/yql/public/udf/service/stub/CMakeLists.linux-x86_64.txt
index fdf4e0405f..fdf4e0405f 100644
--- a/ydb/library/yql/public/udf/service/stub/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/udf/service/stub/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/udf/service/stub/CMakeLists.txt b/ydb/library/yql/public/udf/service/stub/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/udf/service/stub/CMakeLists.txt
+++ b/ydb/library/yql/public/udf/service/stub/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.darwin.txt b/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.darwin-x86_64.txt
index 83f4698355..83f4698355 100644
--- a/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.linux.txt b/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.linux-x86_64.txt
index bb9ae92697..bb9ae92697 100644
--- a/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.txt b/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.txt
+++ b/ydb/library/yql/public/udf/service/terminate_policy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/udf/support/CMakeLists.darwin.txt b/ydb/library/yql/public/udf/support/CMakeLists.darwin-x86_64.txt
index ce3f0497ca..ce3f0497ca 100644
--- a/ydb/library/yql/public/udf/support/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/udf/support/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/udf/support/CMakeLists.linux.txt b/ydb/library/yql/public/udf/support/CMakeLists.linux-x86_64.txt
index 84f8a6d44f..84f8a6d44f 100644
--- a/ydb/library/yql/public/udf/support/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/udf/support/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/udf/support/CMakeLists.txt b/ydb/library/yql/public/udf/support/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/udf/support/CMakeLists.txt
+++ b/ydb/library/yql/public/udf/support/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/udf/tz/CMakeLists.darwin.txt b/ydb/library/yql/public/udf/tz/CMakeLists.darwin-x86_64.txt
index 34a3859929..34a3859929 100644
--- a/ydb/library/yql/public/udf/tz/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/udf/tz/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/udf/tz/CMakeLists.linux.txt b/ydb/library/yql/public/udf/tz/CMakeLists.linux-x86_64.txt
index 324920a3a1..324920a3a1 100644
--- a/ydb/library/yql/public/udf/tz/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/udf/tz/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/udf/tz/CMakeLists.txt b/ydb/library/yql/public/udf/tz/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/udf/tz/CMakeLists.txt
+++ b/ydb/library/yql/public/udf/tz/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/public/udf/ut/CMakeLists.darwin.txt b/ydb/library/yql/public/udf/ut/CMakeLists.darwin-x86_64.txt
index c0e0c74e5c..c0e0c74e5c 100644
--- a/ydb/library/yql/public/udf/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/public/udf/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/public/udf/ut/CMakeLists.linux.txt b/ydb/library/yql/public/udf/ut/CMakeLists.linux-x86_64.txt
index 379381154d..379381154d 100644
--- a/ydb/library/yql/public/udf/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/public/udf/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/public/udf/ut/CMakeLists.txt b/ydb/library/yql/public/udf/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/public/udf/ut/CMakeLists.txt
+++ b/ydb/library/yql/public/udf/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/CMakeLists.darwin.txt b/ydb/library/yql/sql/CMakeLists.darwin-x86_64.txt
index 74d5ed1972..74d5ed1972 100644
--- a/ydb/library/yql/sql/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/CMakeLists.linux.txt b/ydb/library/yql/sql/CMakeLists.linux-x86_64.txt
index cc503b13ed..cc503b13ed 100644
--- a/ydb/library/yql/sql/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/CMakeLists.txt b/ydb/library/yql/sql/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/CMakeLists.txt
+++ b/ydb/library/yql/sql/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/pg/CMakeLists.darwin.txt b/ydb/library/yql/sql/pg/CMakeLists.darwin-x86_64.txt
index 2337fcbd45..2337fcbd45 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/pg/CMakeLists.linux.txt b/ydb/library/yql/sql/pg/CMakeLists.linux-x86_64.txt
index 477c06a316..477c06a316 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/pg/CMakeLists.txt b/ydb/library/yql/sql/pg/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/pg/CMakeLists.txt
+++ b/ydb/library/yql/sql/pg/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/pg/ut/CMakeLists.darwin.txt b/ydb/library/yql/sql/pg/ut/CMakeLists.darwin-x86_64.txt
index e9d6361703..e9d6361703 100644
--- a/ydb/library/yql/sql/pg/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/pg/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/pg/ut/CMakeLists.linux.txt b/ydb/library/yql/sql/pg/ut/CMakeLists.linux-x86_64.txt
index ff508ea705..ff508ea705 100644
--- a/ydb/library/yql/sql/pg/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/pg/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/pg/ut/CMakeLists.txt b/ydb/library/yql/sql/pg/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/pg/ut/CMakeLists.txt
+++ b/ydb/library/yql/sql/pg/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/pg_dummy/CMakeLists.darwin.txt b/ydb/library/yql/sql/pg_dummy/CMakeLists.darwin-x86_64.txt
index ce0ff89da5..ce0ff89da5 100644
--- a/ydb/library/yql/sql/pg_dummy/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/pg_dummy/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/pg_dummy/CMakeLists.linux.txt b/ydb/library/yql/sql/pg_dummy/CMakeLists.linux-x86_64.txt
index de0ed248cc..de0ed248cc 100644
--- a/ydb/library/yql/sql/pg_dummy/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/pg_dummy/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/pg_dummy/CMakeLists.txt b/ydb/library/yql/sql/pg_dummy/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/pg_dummy/CMakeLists.txt
+++ b/ydb/library/yql/sql/pg_dummy/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/settings/CMakeLists.darwin.txt b/ydb/library/yql/sql/settings/CMakeLists.darwin-x86_64.txt
index ccb58a596b..ccb58a596b 100644
--- a/ydb/library/yql/sql/settings/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/settings/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/settings/CMakeLists.linux.txt b/ydb/library/yql/sql/settings/CMakeLists.linux-x86_64.txt
index 115422bd4a..115422bd4a 100644
--- a/ydb/library/yql/sql/settings/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/settings/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/settings/CMakeLists.txt b/ydb/library/yql/sql/settings/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/settings/CMakeLists.txt
+++ b/ydb/library/yql/sql/settings/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/v0/CMakeLists.darwin.txt b/ydb/library/yql/sql/v0/CMakeLists.darwin-x86_64.txt
index f2ee61e6f4..f2ee61e6f4 100644
--- a/ydb/library/yql/sql/v0/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/v0/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/v0/CMakeLists.linux.txt b/ydb/library/yql/sql/v0/CMakeLists.linux-x86_64.txt
index 350fbe3fcc..350fbe3fcc 100644
--- a/ydb/library/yql/sql/v0/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/v0/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/v0/CMakeLists.txt b/ydb/library/yql/sql/v0/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/v0/CMakeLists.txt
+++ b/ydb/library/yql/sql/v0/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/v0/lexer/CMakeLists.darwin.txt b/ydb/library/yql/sql/v0/lexer/CMakeLists.darwin-x86_64.txt
index 2e2dddfd7e..2e2dddfd7e 100644
--- a/ydb/library/yql/sql/v0/lexer/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/v0/lexer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/v0/lexer/CMakeLists.linux.txt b/ydb/library/yql/sql/v0/lexer/CMakeLists.linux-x86_64.txt
index d59aa806ce..d59aa806ce 100644
--- a/ydb/library/yql/sql/v0/lexer/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/v0/lexer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/v0/lexer/CMakeLists.txt b/ydb/library/yql/sql/v0/lexer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/v0/lexer/CMakeLists.txt
+++ b/ydb/library/yql/sql/v0/lexer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/v1/CMakeLists.darwin.txt b/ydb/library/yql/sql/v1/CMakeLists.darwin-x86_64.txt
index c45ef671a1..c45ef671a1 100644
--- a/ydb/library/yql/sql/v1/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/v1/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/CMakeLists.linux.txt b/ydb/library/yql/sql/v1/CMakeLists.linux-x86_64.txt
index 2dad150cb3..2dad150cb3 100644
--- a/ydb/library/yql/sql/v1/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/v1/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/CMakeLists.txt b/ydb/library/yql/sql/v1/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/v1/CMakeLists.txt
+++ b/ydb/library/yql/sql/v1/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/v1/format/CMakeLists.darwin.txt b/ydb/library/yql/sql/v1/format/CMakeLists.darwin-x86_64.txt
index 0b8bfe0914..0b8bfe0914 100644
--- a/ydb/library/yql/sql/v1/format/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/v1/format/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/format/CMakeLists.linux.txt b/ydb/library/yql/sql/v1/format/CMakeLists.linux-x86_64.txt
index cb1ff977c6..cb1ff977c6 100644
--- a/ydb/library/yql/sql/v1/format/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/v1/format/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/format/CMakeLists.txt b/ydb/library/yql/sql/v1/format/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/v1/format/CMakeLists.txt
+++ b/ydb/library/yql/sql/v1/format/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/v1/lexer/CMakeLists.darwin.txt b/ydb/library/yql/sql/v1/lexer/CMakeLists.darwin-x86_64.txt
index 39f7d128ee..39f7d128ee 100644
--- a/ydb/library/yql/sql/v1/lexer/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/v1/lexer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/lexer/CMakeLists.linux.txt b/ydb/library/yql/sql/v1/lexer/CMakeLists.linux-x86_64.txt
index 88b5433a1f..88b5433a1f 100644
--- a/ydb/library/yql/sql/v1/lexer/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/v1/lexer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/lexer/CMakeLists.txt b/ydb/library/yql/sql/v1/lexer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/v1/lexer/CMakeLists.txt
+++ b/ydb/library/yql/sql/v1/lexer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/v1/perf/CMakeLists.darwin.txt b/ydb/library/yql/sql/v1/perf/CMakeLists.darwin-x86_64.txt
index 01ffde9253..01ffde9253 100644
--- a/ydb/library/yql/sql/v1/perf/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/v1/perf/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/perf/CMakeLists.linux.txt b/ydb/library/yql/sql/v1/perf/CMakeLists.linux-x86_64.txt
index b1a9c9a4b4..b1a9c9a4b4 100644
--- a/ydb/library/yql/sql/v1/perf/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/v1/perf/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/perf/CMakeLists.txt b/ydb/library/yql/sql/v1/perf/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/v1/perf/CMakeLists.txt
+++ b/ydb/library/yql/sql/v1/perf/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/sql/v1/proto_parser/CMakeLists.darwin.txt b/ydb/library/yql/sql/v1/proto_parser/CMakeLists.darwin-x86_64.txt
index 349b52115a..349b52115a 100644
--- a/ydb/library/yql/sql/v1/proto_parser/CMakeLists.darwin.txt
+++ b/ydb/library/yql/sql/v1/proto_parser/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/proto_parser/CMakeLists.linux.txt b/ydb/library/yql/sql/v1/proto_parser/CMakeLists.linux-x86_64.txt
index 6148a1c88e..6148a1c88e 100644
--- a/ydb/library/yql/sql/v1/proto_parser/CMakeLists.linux.txt
+++ b/ydb/library/yql/sql/v1/proto_parser/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/sql/v1/proto_parser/CMakeLists.txt b/ydb/library/yql/sql/v1/proto_parser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/sql/v1/proto_parser/CMakeLists.txt
+++ b/ydb/library/yql/sql/v1/proto_parser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/CMakeLists.darwin-x86_64.txt
index 10ac5bd4b5..10ac5bd4b5 100644
--- a/ydb/library/yql/udfs/common/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/CMakeLists.linux-x86_64.txt
index 10ac5bd4b5..10ac5bd4b5 100644
--- a/ydb/library/yql/udfs/common/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/CMakeLists.txt b/ydb/library/yql/udfs/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.darwin-x86_64.txt
index e0030346f8..e0030346f8 100644
--- a/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.linux-x86_64.txt
index 719bbf09b4..719bbf09b4 100644
--- a/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.txt b/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/datetime/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/datetime/CMakeLists.darwin-x86_64.txt
index 6ea3c445e9..6ea3c445e9 100644
--- a/ydb/library/yql/udfs/common/datetime/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/datetime/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/datetime/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/datetime/CMakeLists.linux-x86_64.txt
index afa32f5b37..afa32f5b37 100644
--- a/ydb/library/yql/udfs/common/datetime/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/datetime/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/datetime/CMakeLists.txt b/ydb/library/yql/udfs/common/datetime/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/datetime/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/datetime/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/datetime2/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/datetime2/CMakeLists.darwin-x86_64.txt
index 6f8d710a7c..6f8d710a7c 100644
--- a/ydb/library/yql/udfs/common/datetime2/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/datetime2/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/datetime2/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/datetime2/CMakeLists.linux-x86_64.txt
index 33e286d79f..33e286d79f 100644
--- a/ydb/library/yql/udfs/common/datetime2/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/datetime2/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/datetime2/CMakeLists.txt b/ydb/library/yql/udfs/common/datetime2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/datetime2/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/datetime2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/digest/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/digest/CMakeLists.darwin-x86_64.txt
index 091941b691..091941b691 100644
--- a/ydb/library/yql/udfs/common/digest/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/digest/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/digest/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/digest/CMakeLists.linux-x86_64.txt
index 2e4456a743..2e4456a743 100644
--- a/ydb/library/yql/udfs/common/digest/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/digest/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/digest/CMakeLists.txt b/ydb/library/yql/udfs/common/digest/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/digest/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/digest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/histogram/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/histogram/CMakeLists.darwin-x86_64.txt
index 931b511229..931b511229 100644
--- a/ydb/library/yql/udfs/common/histogram/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/histogram/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/histogram/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/histogram/CMakeLists.linux-x86_64.txt
index 4455582200..4455582200 100644
--- a/ydb/library/yql/udfs/common/histogram/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/histogram/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/histogram/CMakeLists.txt b/ydb/library/yql/udfs/common/histogram/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/histogram/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/histogram/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.darwin-x86_64.txt
index c31401f3eb..c31401f3eb 100644
--- a/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.linux-x86_64.txt
index 5049595af3..5049595af3 100644
--- a/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.txt b/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/hyperloglog/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/hyperscan/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/hyperscan/CMakeLists.darwin-x86_64.txt
index c8ce54c59e..c8ce54c59e 100644
--- a/ydb/library/yql/udfs/common/hyperscan/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/hyperscan/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/hyperscan/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/hyperscan/CMakeLists.linux-x86_64.txt
index f1b98e2163..f1b98e2163 100644
--- a/ydb/library/yql/udfs/common/hyperscan/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/hyperscan/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/hyperscan/CMakeLists.txt b/ydb/library/yql/udfs/common/hyperscan/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/ydb/library/yql/udfs/common/hyperscan/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/hyperscan/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/ip_base/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/ip_base/CMakeLists.darwin-x86_64.txt
index 212b03a6fc..212b03a6fc 100644
--- a/ydb/library/yql/udfs/common/ip_base/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/ip_base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/ip_base/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/ip_base/CMakeLists.linux-x86_64.txt
index c3500b818c..c3500b818c 100644
--- a/ydb/library/yql/udfs/common/ip_base/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/ip_base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/ip_base/CMakeLists.txt b/ydb/library/yql/udfs/common/ip_base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/ip_base/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/ip_base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.darwin-x86_64.txt
index 5c41eeae1a..5c41eeae1a 100644
--- a/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.linux-x86_64.txt
index 347d03fbe0..347d03fbe0 100644
--- a/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.txt b/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/ip_base/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/json/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/json/CMakeLists.darwin-x86_64.txt
index 260a11f271..260a11f271 100644
--- a/ydb/library/yql/udfs/common/json/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/json/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/json/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/json/CMakeLists.linux-x86_64.txt
index 84be2050d9..84be2050d9 100644
--- a/ydb/library/yql/udfs/common/json/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/json/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/json/CMakeLists.txt b/ydb/library/yql/udfs/common/json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/json/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/json2/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/json2/CMakeLists.darwin-x86_64.txt
index a26132211d..a26132211d 100644
--- a/ydb/library/yql/udfs/common/json2/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/json2/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/json2/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/json2/CMakeLists.linux-x86_64.txt
index 808af57b77..808af57b77 100644
--- a/ydb/library/yql/udfs/common/json2/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/json2/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/json2/CMakeLists.txt b/ydb/library/yql/udfs/common/json2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/json2/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/json2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/math/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/math/CMakeLists.darwin-x86_64.txt
index 672661b6f2..672661b6f2 100644
--- a/ydb/library/yql/udfs/common/math/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/math/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/math/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/math/CMakeLists.linux-x86_64.txt
index a3c114011e..a3c114011e 100644
--- a/ydb/library/yql/udfs/common/math/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/math/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/math/CMakeLists.txt b/ydb/library/yql/udfs/common/math/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/math/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/math/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/math/lib/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/math/lib/CMakeLists.darwin-x86_64.txt
index 93d31949ea..93d31949ea 100644
--- a/ydb/library/yql/udfs/common/math/lib/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/math/lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/math/lib/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/math/lib/CMakeLists.linux-x86_64.txt
index 483c55ccc5..483c55ccc5 100644
--- a/ydb/library/yql/udfs/common/math/lib/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/math/lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/math/lib/CMakeLists.txt b/ydb/library/yql/udfs/common/math/lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/math/lib/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/math/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/pire/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/pire/CMakeLists.darwin-x86_64.txt
index 7305bacc06..7305bacc06 100644
--- a/ydb/library/yql/udfs/common/pire/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/pire/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/pire/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/pire/CMakeLists.linux-x86_64.txt
index 7a97631d33..7a97631d33 100644
--- a/ydb/library/yql/udfs/common/pire/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/pire/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/pire/CMakeLists.txt b/ydb/library/yql/udfs/common/pire/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/pire/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/pire/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/re2/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/re2/CMakeLists.darwin-x86_64.txt
index 1e90e3974b..1e90e3974b 100644
--- a/ydb/library/yql/udfs/common/re2/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/re2/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/re2/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/re2/CMakeLists.linux-x86_64.txt
index 1731af4334..1731af4334 100644
--- a/ydb/library/yql/udfs/common/re2/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/re2/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/re2/CMakeLists.txt b/ydb/library/yql/udfs/common/re2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/re2/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/re2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/set/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/set/CMakeLists.darwin-x86_64.txt
index b0794f743c..b0794f743c 100644
--- a/ydb/library/yql/udfs/common/set/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/set/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/set/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/set/CMakeLists.linux-x86_64.txt
index 75ac12f476..75ac12f476 100644
--- a/ydb/library/yql/udfs/common/set/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/set/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/set/CMakeLists.txt b/ydb/library/yql/udfs/common/set/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/set/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/set/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/stat/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/stat/CMakeLists.darwin-x86_64.txt
index 1df8d6d188..1df8d6d188 100644
--- a/ydb/library/yql/udfs/common/stat/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/stat/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/stat/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/stat/CMakeLists.linux-x86_64.txt
index dc61b234b3..dc61b234b3 100644
--- a/ydb/library/yql/udfs/common/stat/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/stat/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/stat/CMakeLists.txt b/ydb/library/yql/udfs/common/stat/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/stat/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/stat/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/stat/static/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/stat/static/CMakeLists.darwin-x86_64.txt
index 7dee63a8c0..7dee63a8c0 100644
--- a/ydb/library/yql/udfs/common/stat/static/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/stat/static/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/stat/static/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/stat/static/CMakeLists.linux-x86_64.txt
index 9302da9ae4..9302da9ae4 100644
--- a/ydb/library/yql/udfs/common/stat/static/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/stat/static/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/stat/static/CMakeLists.txt b/ydb/library/yql/udfs/common/stat/static/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/stat/static/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/stat/static/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/stat/ut/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/stat/ut/CMakeLists.darwin-x86_64.txt
index 429299cfca..429299cfca 100644
--- a/ydb/library/yql/udfs/common/stat/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/stat/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/stat/ut/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/stat/ut/CMakeLists.linux-x86_64.txt
index 4b4d1de0e9..4b4d1de0e9 100644
--- a/ydb/library/yql/udfs/common/stat/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/stat/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/stat/ut/CMakeLists.txt b/ydb/library/yql/udfs/common/stat/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/stat/ut/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/stat/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/string/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/string/CMakeLists.darwin-x86_64.txt
index 443f7fdf0c..443f7fdf0c 100644
--- a/ydb/library/yql/udfs/common/string/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/string/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/string/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/string/CMakeLists.linux-x86_64.txt
index 2548da1b23..2548da1b23 100644
--- a/ydb/library/yql/udfs/common/string/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/string/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/string/CMakeLists.txt b/ydb/library/yql/udfs/common/string/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/string/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/string/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/top/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/top/CMakeLists.darwin-x86_64.txt
index b7dd8fe910..b7dd8fe910 100644
--- a/ydb/library/yql/udfs/common/top/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/top/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/top/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/top/CMakeLists.linux-x86_64.txt
index 987243fad3..987243fad3 100644
--- a/ydb/library/yql/udfs/common/top/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/top/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/top/CMakeLists.txt b/ydb/library/yql/udfs/common/top/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/top/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/top/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/topfreq/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/topfreq/CMakeLists.darwin-x86_64.txt
index 38163124c2..38163124c2 100644
--- a/ydb/library/yql/udfs/common/topfreq/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/topfreq/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/topfreq/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/topfreq/CMakeLists.linux-x86_64.txt
index 810c2cc50c..810c2cc50c 100644
--- a/ydb/library/yql/udfs/common/topfreq/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/topfreq/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/topfreq/CMakeLists.txt b/ydb/library/yql/udfs/common/topfreq/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/topfreq/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/topfreq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.darwin-x86_64.txt
index 97c54f0818..97c54f0818 100644
--- a/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.linux-x86_64.txt
index ca42148812..ca42148812 100644
--- a/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.txt b/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/topfreq/static/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.darwin-x86_64.txt
index c34bf0ac20..c34bf0ac20 100644
--- a/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.linux-x86_64.txt
index 894b0438d5..894b0438d5 100644
--- a/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.txt b/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/unicode_base/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/unicode_base/CMakeLists.darwin-x86_64.txt
index fa3a507ca4..fa3a507ca4 100644
--- a/ydb/library/yql/udfs/common/unicode_base/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/unicode_base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/unicode_base/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/unicode_base/CMakeLists.linux-x86_64.txt
index b38c3f47a0..b38c3f47a0 100644
--- a/ydb/library/yql/udfs/common/unicode_base/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/unicode_base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/unicode_base/CMakeLists.txt b/ydb/library/yql/udfs/common/unicode_base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/unicode_base/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/unicode_base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.darwin-x86_64.txt
index 2f90840d64..2f90840d64 100644
--- a/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.linux-x86_64.txt
index 00bc36b686..00bc36b686 100644
--- a/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.txt b/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/unicode_base/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/url_base/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/url_base/CMakeLists.darwin-x86_64.txt
index d6161089ba..d6161089ba 100644
--- a/ydb/library/yql/udfs/common/url_base/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/url_base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/url_base/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/url_base/CMakeLists.linux-x86_64.txt
index dc4b9a0dba..dc4b9a0dba 100644
--- a/ydb/library/yql/udfs/common/url_base/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/url_base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/url_base/CMakeLists.txt b/ydb/library/yql/udfs/common/url_base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/url_base/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/url_base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.darwin-x86_64.txt
index cf9f8d6bda..cf9f8d6bda 100644
--- a/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.linux-x86_64.txt
index cdc5b23fcb..cdc5b23fcb 100644
--- a/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.txt b/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/url_base/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/common/yson2/CMakeLists.darwin.txt b/ydb/library/yql/udfs/common/yson2/CMakeLists.darwin-x86_64.txt
index 2b0d613f77..2b0d613f77 100644
--- a/ydb/library/yql/udfs/common/yson2/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/common/yson2/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/yson2/CMakeLists.linux.txt b/ydb/library/yql/udfs/common/yson2/CMakeLists.linux-x86_64.txt
index 05c8a4a027..05c8a4a027 100644
--- a/ydb/library/yql/udfs/common/yson2/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/common/yson2/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/common/yson2/CMakeLists.txt b/ydb/library/yql/udfs/common/yson2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/common/yson2/CMakeLists.txt
+++ b/ydb/library/yql/udfs/common/yson2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/udfs/logs/dsv/CMakeLists.darwin.txt b/ydb/library/yql/udfs/logs/dsv/CMakeLists.darwin-x86_64.txt
index c41af75814..c41af75814 100644
--- a/ydb/library/yql/udfs/logs/dsv/CMakeLists.darwin.txt
+++ b/ydb/library/yql/udfs/logs/dsv/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/udfs/logs/dsv/CMakeLists.linux.txt b/ydb/library/yql/udfs/logs/dsv/CMakeLists.linux-x86_64.txt
index fac04b3afa..fac04b3afa 100644
--- a/ydb/library/yql/udfs/logs/dsv/CMakeLists.linux.txt
+++ b/ydb/library/yql/udfs/logs/dsv/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/udfs/logs/dsv/CMakeLists.txt b/ydb/library/yql/udfs/logs/dsv/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/udfs/logs/dsv/CMakeLists.txt
+++ b/ydb/library/yql/udfs/logs/dsv/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/CMakeLists.darwin.txt b/ydb/library/yql/utils/CMakeLists.darwin-x86_64.txt
index df9ec7f571..df9ec7f571 100644
--- a/ydb/library/yql/utils/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/CMakeLists.linux.txt b/ydb/library/yql/utils/CMakeLists.linux-x86_64.txt
index df8ded0e6f..df8ded0e6f 100644
--- a/ydb/library/yql/utils/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/CMakeLists.txt b/ydb/library/yql/utils/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/CMakeLists.txt
+++ b/ydb/library/yql/utils/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/actor_log/CMakeLists.darwin.txt b/ydb/library/yql/utils/actor_log/CMakeLists.darwin-x86_64.txt
index fdbde6130a..fdbde6130a 100644
--- a/ydb/library/yql/utils/actor_log/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/actor_log/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/actor_log/CMakeLists.linux.txt b/ydb/library/yql/utils/actor_log/CMakeLists.linux-x86_64.txt
index 6716245e74..6716245e74 100644
--- a/ydb/library/yql/utils/actor_log/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/actor_log/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/actor_log/CMakeLists.txt b/ydb/library/yql/utils/actor_log/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/actor_log/CMakeLists.txt
+++ b/ydb/library/yql/utils/actor_log/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/actors/CMakeLists.darwin.txt b/ydb/library/yql/utils/actors/CMakeLists.darwin-x86_64.txt
index d550257eae..d550257eae 100644
--- a/ydb/library/yql/utils/actors/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/actors/CMakeLists.linux.txt b/ydb/library/yql/utils/actors/CMakeLists.linux-x86_64.txt
index 59ede3ac33..59ede3ac33 100644
--- a/ydb/library/yql/utils/actors/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/actors/CMakeLists.txt b/ydb/library/yql/utils/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/actors/CMakeLists.txt
+++ b/ydb/library/yql/utils/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/actors/ut/CMakeLists.darwin.txt b/ydb/library/yql/utils/actors/ut/CMakeLists.darwin-x86_64.txt
index cf28d810df..cf28d810df 100644
--- a/ydb/library/yql/utils/actors/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/actors/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/actors/ut/CMakeLists.linux.txt b/ydb/library/yql/utils/actors/ut/CMakeLists.linux-x86_64.txt
index 1d625e8dfb..1d625e8dfb 100644
--- a/ydb/library/yql/utils/actors/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/actors/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/actors/ut/CMakeLists.txt b/ydb/library/yql/utils/actors/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/actors/ut/CMakeLists.txt
+++ b/ydb/library/yql/utils/actors/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/backtrace/CMakeLists.darwin.txt b/ydb/library/yql/utils/backtrace/CMakeLists.darwin-x86_64.txt
index 596203686f..596203686f 100644
--- a/ydb/library/yql/utils/backtrace/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/backtrace/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/backtrace/CMakeLists.linux.txt b/ydb/library/yql/utils/backtrace/CMakeLists.linux-x86_64.txt
index 941290fc59..941290fc59 100644
--- a/ydb/library/yql/utils/backtrace/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/backtrace/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/backtrace/CMakeLists.txt b/ydb/library/yql/utils/backtrace/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/backtrace/CMakeLists.txt
+++ b/ydb/library/yql/utils/backtrace/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/failure_injector/CMakeLists.darwin.txt b/ydb/library/yql/utils/failure_injector/CMakeLists.darwin-x86_64.txt
index f97a70dd59..f97a70dd59 100644
--- a/ydb/library/yql/utils/failure_injector/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/failure_injector/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/failure_injector/CMakeLists.linux.txt b/ydb/library/yql/utils/failure_injector/CMakeLists.linux-x86_64.txt
index 4de721142b..4de721142b 100644
--- a/ydb/library/yql/utils/failure_injector/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/failure_injector/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/failure_injector/CMakeLists.txt b/ydb/library/yql/utils/failure_injector/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/failure_injector/CMakeLists.txt
+++ b/ydb/library/yql/utils/failure_injector/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/failure_injector/ut/CMakeLists.darwin.txt b/ydb/library/yql/utils/failure_injector/ut/CMakeLists.darwin-x86_64.txt
index 950fc45eec..950fc45eec 100644
--- a/ydb/library/yql/utils/failure_injector/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/failure_injector/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/failure_injector/ut/CMakeLists.linux.txt b/ydb/library/yql/utils/failure_injector/ut/CMakeLists.linux-x86_64.txt
index 455ac58622..455ac58622 100644
--- a/ydb/library/yql/utils/failure_injector/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/failure_injector/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/failure_injector/ut/CMakeLists.txt b/ydb/library/yql/utils/failure_injector/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/failure_injector/ut/CMakeLists.txt
+++ b/ydb/library/yql/utils/failure_injector/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/fetch/CMakeLists.darwin.txt b/ydb/library/yql/utils/fetch/CMakeLists.darwin-x86_64.txt
index 8f28753f2c..8f28753f2c 100644
--- a/ydb/library/yql/utils/fetch/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/fetch/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/fetch/CMakeLists.linux.txt b/ydb/library/yql/utils/fetch/CMakeLists.linux-x86_64.txt
index 7bd513f38d..7bd513f38d 100644
--- a/ydb/library/yql/utils/fetch/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/fetch/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/fetch/CMakeLists.txt b/ydb/library/yql/utils/fetch/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/fetch/CMakeLists.txt
+++ b/ydb/library/yql/utils/fetch/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/log/CMakeLists.darwin.txt b/ydb/library/yql/utils/log/CMakeLists.darwin-x86_64.txt
index 092b94e027..092b94e027 100644
--- a/ydb/library/yql/utils/log/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/log/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/log/CMakeLists.linux.txt b/ydb/library/yql/utils/log/CMakeLists.linux-x86_64.txt
index d836e88184..d836e88184 100644
--- a/ydb/library/yql/utils/log/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/log/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/log/CMakeLists.txt b/ydb/library/yql/utils/log/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/log/CMakeLists.txt
+++ b/ydb/library/yql/utils/log/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/log/proto/CMakeLists.darwin.txt b/ydb/library/yql/utils/log/proto/CMakeLists.darwin-x86_64.txt
index d4898e8a17..d4898e8a17 100644
--- a/ydb/library/yql/utils/log/proto/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/log/proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/log/proto/CMakeLists.linux.txt b/ydb/library/yql/utils/log/proto/CMakeLists.linux-x86_64.txt
index e853dc9265..e853dc9265 100644
--- a/ydb/library/yql/utils/log/proto/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/log/proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/log/proto/CMakeLists.txt b/ydb/library/yql/utils/log/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/log/proto/CMakeLists.txt
+++ b/ydb/library/yql/utils/log/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/log/ut/CMakeLists.darwin.txt b/ydb/library/yql/utils/log/ut/CMakeLists.darwin-x86_64.txt
index dcd9d9113e..dcd9d9113e 100644
--- a/ydb/library/yql/utils/log/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/log/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/log/ut/CMakeLists.linux.txt b/ydb/library/yql/utils/log/ut/CMakeLists.linux-x86_64.txt
index ac74f3cc14..ac74f3cc14 100644
--- a/ydb/library/yql/utils/log/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/log/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/log/ut/CMakeLists.txt b/ydb/library/yql/utils/log/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/log/ut/CMakeLists.txt
+++ b/ydb/library/yql/utils/log/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/test_http_server/CMakeLists.darwin.txt b/ydb/library/yql/utils/test_http_server/CMakeLists.darwin-x86_64.txt
index cae5b436b0..cae5b436b0 100644
--- a/ydb/library/yql/utils/test_http_server/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/test_http_server/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/test_http_server/CMakeLists.linux.txt b/ydb/library/yql/utils/test_http_server/CMakeLists.linux-x86_64.txt
index bd82cf3c9e..bd82cf3c9e 100644
--- a/ydb/library/yql/utils/test_http_server/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/test_http_server/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/test_http_server/CMakeLists.txt b/ydb/library/yql/utils/test_http_server/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/test_http_server/CMakeLists.txt
+++ b/ydb/library/yql/utils/test_http_server/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/threading/CMakeLists.darwin.txt b/ydb/library/yql/utils/threading/CMakeLists.darwin-x86_64.txt
index 088417b3f9..088417b3f9 100644
--- a/ydb/library/yql/utils/threading/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/threading/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/threading/CMakeLists.linux.txt b/ydb/library/yql/utils/threading/CMakeLists.linux-x86_64.txt
index b401781229..b401781229 100644
--- a/ydb/library/yql/utils/threading/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/threading/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/threading/CMakeLists.txt b/ydb/library/yql/utils/threading/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/threading/CMakeLists.txt
+++ b/ydb/library/yql/utils/threading/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/utils/ut/CMakeLists.darwin.txt b/ydb/library/yql/utils/ut/CMakeLists.darwin-x86_64.txt
index 68f32c2227..68f32c2227 100644
--- a/ydb/library/yql/utils/ut/CMakeLists.darwin.txt
+++ b/ydb/library/yql/utils/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/library/yql/utils/ut/CMakeLists.linux.txt b/ydb/library/yql/utils/ut/CMakeLists.linux-x86_64.txt
index 3bb2cabf6c..3bb2cabf6c 100644
--- a/ydb/library/yql/utils/ut/CMakeLists.linux.txt
+++ b/ydb/library/yql/utils/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/library/yql/utils/ut/CMakeLists.txt b/ydb/library/yql/utils/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/library/yql/utils/ut/CMakeLists.txt
+++ b/ydb/library/yql/utils/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/client/yc_private/iam/CMakeLists.darwin.txt b/ydb/public/api/client/yc_private/iam/CMakeLists.darwin-x86_64.txt
index 0626a13e85..0626a13e85 100644
--- a/ydb/public/api/client/yc_private/iam/CMakeLists.darwin.txt
+++ b/ydb/public/api/client/yc_private/iam/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/client/yc_private/iam/CMakeLists.linux.txt b/ydb/public/api/client/yc_private/iam/CMakeLists.linux-x86_64.txt
index 402877430c..402877430c 100644
--- a/ydb/public/api/client/yc_private/iam/CMakeLists.linux.txt
+++ b/ydb/public/api/client/yc_private/iam/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/client/yc_private/iam/CMakeLists.txt b/ydb/public/api/client/yc_private/iam/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/client/yc_private/iam/CMakeLists.txt
+++ b/ydb/public/api/client/yc_private/iam/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/client/yc_private/operation/CMakeLists.darwin.txt b/ydb/public/api/client/yc_private/operation/CMakeLists.darwin-x86_64.txt
index 0256d03d1b..0256d03d1b 100644
--- a/ydb/public/api/client/yc_private/operation/CMakeLists.darwin.txt
+++ b/ydb/public/api/client/yc_private/operation/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/client/yc_private/operation/CMakeLists.linux.txt b/ydb/public/api/client/yc_private/operation/CMakeLists.linux-x86_64.txt
index b3575c5b13..b3575c5b13 100644
--- a/ydb/public/api/client/yc_private/operation/CMakeLists.linux.txt
+++ b/ydb/public/api/client/yc_private/operation/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/client/yc_private/operation/CMakeLists.txt b/ydb/public/api/client/yc_private/operation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/client/yc_private/operation/CMakeLists.txt
+++ b/ydb/public/api/client/yc_private/operation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.darwin.txt b/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.darwin-x86_64.txt
index fb8d9ca06d..fb8d9ca06d 100644
--- a/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.darwin.txt
+++ b/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.linux.txt b/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.linux-x86_64.txt
index 0a0304062b..0a0304062b 100644
--- a/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.linux.txt
+++ b/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.txt b/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.txt
+++ b/ydb/public/api/client/yc_private/resourcemanager/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.darwin.txt b/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.darwin-x86_64.txt
index 816ad158f9..816ad158f9 100644
--- a/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.darwin.txt
+++ b/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.linux.txt b/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.linux-x86_64.txt
index 4df5941260..4df5941260 100644
--- a/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.linux.txt
+++ b/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.txt b/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.txt
+++ b/ydb/public/api/client/yc_private/servicecontrol/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/client/yc_public/common/CMakeLists.darwin.txt b/ydb/public/api/client/yc_public/common/CMakeLists.darwin-x86_64.txt
index db9a160460..db9a160460 100644
--- a/ydb/public/api/client/yc_public/common/CMakeLists.darwin.txt
+++ b/ydb/public/api/client/yc_public/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/client/yc_public/common/CMakeLists.linux.txt b/ydb/public/api/client/yc_public/common/CMakeLists.linux-x86_64.txt
index 552b44a3ad..552b44a3ad 100644
--- a/ydb/public/api/client/yc_public/common/CMakeLists.linux.txt
+++ b/ydb/public/api/client/yc_public/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/client/yc_public/common/CMakeLists.txt b/ydb/public/api/client/yc_public/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/client/yc_public/common/CMakeLists.txt
+++ b/ydb/public/api/client/yc_public/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/client/yc_public/events/CMakeLists.darwin.txt b/ydb/public/api/client/yc_public/events/CMakeLists.darwin-x86_64.txt
index 961a1fe547..961a1fe547 100644
--- a/ydb/public/api/client/yc_public/events/CMakeLists.darwin.txt
+++ b/ydb/public/api/client/yc_public/events/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/client/yc_public/events/CMakeLists.linux.txt b/ydb/public/api/client/yc_public/events/CMakeLists.linux-x86_64.txt
index 45e4626a0d..45e4626a0d 100644
--- a/ydb/public/api/client/yc_public/events/CMakeLists.linux.txt
+++ b/ydb/public/api/client/yc_public/events/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/client/yc_public/events/CMakeLists.txt b/ydb/public/api/client/yc_public/events/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/client/yc_public/events/CMakeLists.txt
+++ b/ydb/public/api/client/yc_public/events/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/client/yc_public/iam/CMakeLists.darwin.txt b/ydb/public/api/client/yc_public/iam/CMakeLists.darwin-x86_64.txt
index 9c04ab4761..9c04ab4761 100644
--- a/ydb/public/api/client/yc_public/iam/CMakeLists.darwin.txt
+++ b/ydb/public/api/client/yc_public/iam/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/client/yc_public/iam/CMakeLists.linux.txt b/ydb/public/api/client/yc_public/iam/CMakeLists.linux-x86_64.txt
index 40c8cdd96c..40c8cdd96c 100644
--- a/ydb/public/api/client/yc_public/iam/CMakeLists.linux.txt
+++ b/ydb/public/api/client/yc_public/iam/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/client/yc_public/iam/CMakeLists.txt b/ydb/public/api/client/yc_public/iam/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/client/yc_public/iam/CMakeLists.txt
+++ b/ydb/public/api/client/yc_public/iam/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/client/yc_public/logging/CMakeLists.darwin.txt b/ydb/public/api/client/yc_public/logging/CMakeLists.darwin-x86_64.txt
index 3aa1472e57..3aa1472e57 100644
--- a/ydb/public/api/client/yc_public/logging/CMakeLists.darwin.txt
+++ b/ydb/public/api/client/yc_public/logging/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/client/yc_public/logging/CMakeLists.linux.txt b/ydb/public/api/client/yc_public/logging/CMakeLists.linux-x86_64.txt
index e32b332d3b..e32b332d3b 100644
--- a/ydb/public/api/client/yc_public/logging/CMakeLists.linux.txt
+++ b/ydb/public/api/client/yc_public/logging/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/client/yc_public/logging/CMakeLists.txt b/ydb/public/api/client/yc_public/logging/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/client/yc_public/logging/CMakeLists.txt
+++ b/ydb/public/api/client/yc_public/logging/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/grpc/CMakeLists.darwin.txt b/ydb/public/api/grpc/CMakeLists.darwin-x86_64.txt
index ba9a001ffb..ba9a001ffb 100644
--- a/ydb/public/api/grpc/CMakeLists.darwin.txt
+++ b/ydb/public/api/grpc/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/grpc/CMakeLists.linux.txt b/ydb/public/api/grpc/CMakeLists.linux-x86_64.txt
index 15c07327ed..15c07327ed 100644
--- a/ydb/public/api/grpc/CMakeLists.linux.txt
+++ b/ydb/public/api/grpc/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/grpc/CMakeLists.txt b/ydb/public/api/grpc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/grpc/CMakeLists.txt
+++ b/ydb/public/api/grpc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/grpc/draft/CMakeLists.darwin.txt b/ydb/public/api/grpc/draft/CMakeLists.darwin-x86_64.txt
index 0f714bbe44..0f714bbe44 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.darwin.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/grpc/draft/CMakeLists.linux.txt b/ydb/public/api/grpc/draft/CMakeLists.linux-x86_64.txt
index 93c8649f4f..93c8649f4f 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.linux.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/grpc/draft/CMakeLists.txt b/ydb/public/api/grpc/draft/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/grpc/draft/CMakeLists.txt
+++ b/ydb/public/api/grpc/draft/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/protos/CMakeLists.darwin.txt b/ydb/public/api/protos/CMakeLists.darwin-x86_64.txt
index 73f526785d..73f526785d 100644
--- a/ydb/public/api/protos/CMakeLists.darwin.txt
+++ b/ydb/public/api/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/protos/CMakeLists.linux.txt b/ydb/public/api/protos/CMakeLists.linux-x86_64.txt
index c04805976d..c04805976d 100644
--- a/ydb/public/api/protos/CMakeLists.linux.txt
+++ b/ydb/public/api/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/protos/CMakeLists.txt b/ydb/public/api/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/protos/CMakeLists.txt
+++ b/ydb/public/api/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/protos/annotations/CMakeLists.darwin.txt b/ydb/public/api/protos/annotations/CMakeLists.darwin-x86_64.txt
index 4c41d677bd..4c41d677bd 100644
--- a/ydb/public/api/protos/annotations/CMakeLists.darwin.txt
+++ b/ydb/public/api/protos/annotations/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/protos/annotations/CMakeLists.linux.txt b/ydb/public/api/protos/annotations/CMakeLists.linux-x86_64.txt
index 559ce387ba..559ce387ba 100644
--- a/ydb/public/api/protos/annotations/CMakeLists.linux.txt
+++ b/ydb/public/api/protos/annotations/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/protos/annotations/CMakeLists.txt b/ydb/public/api/protos/annotations/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/protos/annotations/CMakeLists.txt
+++ b/ydb/public/api/protos/annotations/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/api/protos/out/CMakeLists.darwin.txt b/ydb/public/api/protos/out/CMakeLists.darwin-x86_64.txt
index 09f1a2240c..09f1a2240c 100644
--- a/ydb/public/api/protos/out/CMakeLists.darwin.txt
+++ b/ydb/public/api/protos/out/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/api/protos/out/CMakeLists.linux.txt b/ydb/public/api/protos/out/CMakeLists.linux-x86_64.txt
index da29a4658e..da29a4658e 100644
--- a/ydb/public/api/protos/out/CMakeLists.linux.txt
+++ b/ydb/public/api/protos/out/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/api/protos/out/CMakeLists.txt b/ydb/public/api/protos/out/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/api/protos/out/CMakeLists.txt
+++ b/ydb/public/api/protos/out/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/base/CMakeLists.darwin.txt b/ydb/public/lib/base/CMakeLists.darwin-x86_64.txt
index a00fef6402..a00fef6402 100644
--- a/ydb/public/lib/base/CMakeLists.darwin.txt
+++ b/ydb/public/lib/base/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/base/CMakeLists.linux.txt b/ydb/public/lib/base/CMakeLists.linux-x86_64.txt
index 898f02c041..898f02c041 100644
--- a/ydb/public/lib/base/CMakeLists.linux.txt
+++ b/ydb/public/lib/base/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/base/CMakeLists.txt b/ydb/public/lib/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/base/CMakeLists.txt
+++ b/ydb/public/lib/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/deprecated/client/CMakeLists.darwin.txt b/ydb/public/lib/deprecated/client/CMakeLists.darwin-x86_64.txt
index f113cd80ea..f113cd80ea 100644
--- a/ydb/public/lib/deprecated/client/CMakeLists.darwin.txt
+++ b/ydb/public/lib/deprecated/client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/deprecated/client/CMakeLists.linux.txt b/ydb/public/lib/deprecated/client/CMakeLists.linux-x86_64.txt
index 97272ed228..97272ed228 100644
--- a/ydb/public/lib/deprecated/client/CMakeLists.linux.txt
+++ b/ydb/public/lib/deprecated/client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/deprecated/client/CMakeLists.txt b/ydb/public/lib/deprecated/client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/deprecated/client/CMakeLists.txt
+++ b/ydb/public/lib/deprecated/client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/deprecated/kicli/CMakeLists.darwin.txt b/ydb/public/lib/deprecated/kicli/CMakeLists.darwin-x86_64.txt
index 5c49ae22e1..5c49ae22e1 100644
--- a/ydb/public/lib/deprecated/kicli/CMakeLists.darwin.txt
+++ b/ydb/public/lib/deprecated/kicli/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/deprecated/kicli/CMakeLists.linux.txt b/ydb/public/lib/deprecated/kicli/CMakeLists.linux-x86_64.txt
index 290faa8335..290faa8335 100644
--- a/ydb/public/lib/deprecated/kicli/CMakeLists.linux.txt
+++ b/ydb/public/lib/deprecated/kicli/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/deprecated/kicli/CMakeLists.txt b/ydb/public/lib/deprecated/kicli/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/deprecated/kicli/CMakeLists.txt
+++ b/ydb/public/lib/deprecated/kicli/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/deprecated/kicli/ut/CMakeLists.darwin.txt b/ydb/public/lib/deprecated/kicli/ut/CMakeLists.darwin-x86_64.txt
index cdcec7e1b7..cdcec7e1b7 100644
--- a/ydb/public/lib/deprecated/kicli/ut/CMakeLists.darwin.txt
+++ b/ydb/public/lib/deprecated/kicli/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/deprecated/kicli/ut/CMakeLists.linux.txt b/ydb/public/lib/deprecated/kicli/ut/CMakeLists.linux-x86_64.txt
index 6cdbf5feaf..6cdbf5feaf 100644
--- a/ydb/public/lib/deprecated/kicli/ut/CMakeLists.linux.txt
+++ b/ydb/public/lib/deprecated/kicli/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/deprecated/kicli/ut/CMakeLists.txt b/ydb/public/lib/deprecated/kicli/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/deprecated/kicli/ut/CMakeLists.txt
+++ b/ydb/public/lib/deprecated/kicli/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/experimental/CMakeLists.darwin.txt b/ydb/public/lib/experimental/CMakeLists.darwin-x86_64.txt
index da9305bb1e..da9305bb1e 100644
--- a/ydb/public/lib/experimental/CMakeLists.darwin.txt
+++ b/ydb/public/lib/experimental/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/experimental/CMakeLists.linux.txt b/ydb/public/lib/experimental/CMakeLists.linux-x86_64.txt
index 655ff7dc3f..655ff7dc3f 100644
--- a/ydb/public/lib/experimental/CMakeLists.linux.txt
+++ b/ydb/public/lib/experimental/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/experimental/CMakeLists.txt b/ydb/public/lib/experimental/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/experimental/CMakeLists.txt
+++ b/ydb/public/lib/experimental/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/fq/CMakeLists.darwin.txt b/ydb/public/lib/fq/CMakeLists.darwin-x86_64.txt
index 4690812914..4690812914 100644
--- a/ydb/public/lib/fq/CMakeLists.darwin.txt
+++ b/ydb/public/lib/fq/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/fq/CMakeLists.linux.txt b/ydb/public/lib/fq/CMakeLists.linux-x86_64.txt
index 652d8d5a5e..652d8d5a5e 100644
--- a/ydb/public/lib/fq/CMakeLists.linux.txt
+++ b/ydb/public/lib/fq/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/fq/CMakeLists.txt b/ydb/public/lib/fq/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/fq/CMakeLists.txt
+++ b/ydb/public/lib/fq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/idx_test/CMakeLists.darwin.txt b/ydb/public/lib/idx_test/CMakeLists.darwin-x86_64.txt
index 392ae5d066..392ae5d066 100644
--- a/ydb/public/lib/idx_test/CMakeLists.darwin.txt
+++ b/ydb/public/lib/idx_test/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/idx_test/CMakeLists.linux.txt b/ydb/public/lib/idx_test/CMakeLists.linux-x86_64.txt
index 790a670603..790a670603 100644
--- a/ydb/public/lib/idx_test/CMakeLists.linux.txt
+++ b/ydb/public/lib/idx_test/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/idx_test/CMakeLists.txt b/ydb/public/lib/idx_test/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/idx_test/CMakeLists.txt
+++ b/ydb/public/lib/idx_test/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/idx_test/ut/CMakeLists.darwin.txt b/ydb/public/lib/idx_test/ut/CMakeLists.darwin-x86_64.txt
index 10c3198406..10c3198406 100644
--- a/ydb/public/lib/idx_test/ut/CMakeLists.darwin.txt
+++ b/ydb/public/lib/idx_test/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/idx_test/ut/CMakeLists.linux.txt b/ydb/public/lib/idx_test/ut/CMakeLists.linux-x86_64.txt
index beb6b852bc..beb6b852bc 100644
--- a/ydb/public/lib/idx_test/ut/CMakeLists.linux.txt
+++ b/ydb/public/lib/idx_test/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/idx_test/ut/CMakeLists.txt b/ydb/public/lib/idx_test/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/idx_test/ut/CMakeLists.txt
+++ b/ydb/public/lib/idx_test/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/json_value/CMakeLists.darwin.txt b/ydb/public/lib/json_value/CMakeLists.darwin-x86_64.txt
index 90c26f006f..90c26f006f 100644
--- a/ydb/public/lib/json_value/CMakeLists.darwin.txt
+++ b/ydb/public/lib/json_value/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/json_value/CMakeLists.linux.txt b/ydb/public/lib/json_value/CMakeLists.linux-x86_64.txt
index d795b25344..d795b25344 100644
--- a/ydb/public/lib/json_value/CMakeLists.linux.txt
+++ b/ydb/public/lib/json_value/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/json_value/CMakeLists.txt b/ydb/public/lib/json_value/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/json_value/CMakeLists.txt
+++ b/ydb/public/lib/json_value/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/json_value/ut/CMakeLists.darwin.txt b/ydb/public/lib/json_value/ut/CMakeLists.darwin-x86_64.txt
index ac82822920..ac82822920 100644
--- a/ydb/public/lib/json_value/ut/CMakeLists.darwin.txt
+++ b/ydb/public/lib/json_value/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/json_value/ut/CMakeLists.linux.txt b/ydb/public/lib/json_value/ut/CMakeLists.linux-x86_64.txt
index 40c704c7c0..40c704c7c0 100644
--- a/ydb/public/lib/json_value/ut/CMakeLists.linux.txt
+++ b/ydb/public/lib/json_value/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/json_value/ut/CMakeLists.txt b/ydb/public/lib/json_value/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/json_value/ut/CMakeLists.txt
+++ b/ydb/public/lib/json_value/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/jwt/CMakeLists.darwin.txt b/ydb/public/lib/jwt/CMakeLists.darwin-x86_64.txt
index a8da4b49f7..a8da4b49f7 100644
--- a/ydb/public/lib/jwt/CMakeLists.darwin.txt
+++ b/ydb/public/lib/jwt/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/jwt/CMakeLists.linux.txt b/ydb/public/lib/jwt/CMakeLists.linux-x86_64.txt
index 276c34d4fb..276c34d4fb 100644
--- a/ydb/public/lib/jwt/CMakeLists.linux.txt
+++ b/ydb/public/lib/jwt/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/jwt/CMakeLists.txt b/ydb/public/lib/jwt/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/jwt/CMakeLists.txt
+++ b/ydb/public/lib/jwt/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/operation_id/CMakeLists.darwin.txt b/ydb/public/lib/operation_id/CMakeLists.darwin-x86_64.txt
index b10c999db5..b10c999db5 100644
--- a/ydb/public/lib/operation_id/CMakeLists.darwin.txt
+++ b/ydb/public/lib/operation_id/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/operation_id/CMakeLists.linux.txt b/ydb/public/lib/operation_id/CMakeLists.linux-x86_64.txt
index 72e8660020..72e8660020 100644
--- a/ydb/public/lib/operation_id/CMakeLists.linux.txt
+++ b/ydb/public/lib/operation_id/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/operation_id/CMakeLists.txt b/ydb/public/lib/operation_id/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/operation_id/CMakeLists.txt
+++ b/ydb/public/lib/operation_id/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/operation_id/protos/CMakeLists.darwin.txt b/ydb/public/lib/operation_id/protos/CMakeLists.darwin-x86_64.txt
index a800067d56..a800067d56 100644
--- a/ydb/public/lib/operation_id/protos/CMakeLists.darwin.txt
+++ b/ydb/public/lib/operation_id/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/operation_id/protos/CMakeLists.linux.txt b/ydb/public/lib/operation_id/protos/CMakeLists.linux-x86_64.txt
index d316cb2ab7..d316cb2ab7 100644
--- a/ydb/public/lib/operation_id/protos/CMakeLists.linux.txt
+++ b/ydb/public/lib/operation_id/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/operation_id/protos/CMakeLists.txt b/ydb/public/lib/operation_id/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/operation_id/protos/CMakeLists.txt
+++ b/ydb/public/lib/operation_id/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/operation_id/ut/CMakeLists.darwin.txt b/ydb/public/lib/operation_id/ut/CMakeLists.darwin-x86_64.txt
index 48d629b4c4..48d629b4c4 100644
--- a/ydb/public/lib/operation_id/ut/CMakeLists.darwin.txt
+++ b/ydb/public/lib/operation_id/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/operation_id/ut/CMakeLists.linux.txt b/ydb/public/lib/operation_id/ut/CMakeLists.linux-x86_64.txt
index 0446f69863..0446f69863 100644
--- a/ydb/public/lib/operation_id/ut/CMakeLists.linux.txt
+++ b/ydb/public/lib/operation_id/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/operation_id/ut/CMakeLists.txt b/ydb/public/lib/operation_id/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/operation_id/ut/CMakeLists.txt
+++ b/ydb/public/lib/operation_id/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/scheme_types/CMakeLists.darwin.txt b/ydb/public/lib/scheme_types/CMakeLists.darwin-x86_64.txt
index 80504edf48..80504edf48 100644
--- a/ydb/public/lib/scheme_types/CMakeLists.darwin.txt
+++ b/ydb/public/lib/scheme_types/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/scheme_types/CMakeLists.linux.txt b/ydb/public/lib/scheme_types/CMakeLists.linux-x86_64.txt
index 48f32db022..48f32db022 100644
--- a/ydb/public/lib/scheme_types/CMakeLists.linux.txt
+++ b/ydb/public/lib/scheme_types/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/scheme_types/CMakeLists.txt b/ydb/public/lib/scheme_types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/scheme_types/CMakeLists.txt
+++ b/ydb/public/lib/scheme_types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/validation/CMakeLists.darwin.txt b/ydb/public/lib/validation/CMakeLists.darwin-x86_64.txt
index 3c799a918d..3c799a918d 100644
--- a/ydb/public/lib/validation/CMakeLists.darwin.txt
+++ b/ydb/public/lib/validation/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/validation/CMakeLists.linux.txt b/ydb/public/lib/validation/CMakeLists.linux-x86_64.txt
index a420db7428..a420db7428 100644
--- a/ydb/public/lib/validation/CMakeLists.linux.txt
+++ b/ydb/public/lib/validation/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/validation/CMakeLists.txt b/ydb/public/lib/validation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/validation/CMakeLists.txt
+++ b/ydb/public/lib/validation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/validation/ut/CMakeLists.darwin.txt b/ydb/public/lib/validation/ut/CMakeLists.darwin-x86_64.txt
index 37f5a1c899..37f5a1c899 100644
--- a/ydb/public/lib/validation/ut/CMakeLists.darwin.txt
+++ b/ydb/public/lib/validation/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/validation/ut/CMakeLists.linux.txt b/ydb/public/lib/validation/ut/CMakeLists.linux-x86_64.txt
index 208132f897..208132f897 100644
--- a/ydb/public/lib/validation/ut/CMakeLists.linux.txt
+++ b/ydb/public/lib/validation/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/validation/ut/CMakeLists.txt b/ydb/public/lib/validation/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/validation/ut/CMakeLists.txt
+++ b/ydb/public/lib/validation/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/validation/ut/protos/CMakeLists.darwin.txt b/ydb/public/lib/validation/ut/protos/CMakeLists.darwin-x86_64.txt
index 7f7553fb80..7f7553fb80 100644
--- a/ydb/public/lib/validation/ut/protos/CMakeLists.darwin.txt
+++ b/ydb/public/lib/validation/ut/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/validation/ut/protos/CMakeLists.linux.txt b/ydb/public/lib/validation/ut/protos/CMakeLists.linux-x86_64.txt
index 880fa86a9b..880fa86a9b 100644
--- a/ydb/public/lib/validation/ut/protos/CMakeLists.linux.txt
+++ b/ydb/public/lib/validation/ut/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/validation/ut/protos/CMakeLists.txt b/ydb/public/lib/validation/ut/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/validation/ut/protos/CMakeLists.txt
+++ b/ydb/public/lib/validation/ut/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/value/CMakeLists.darwin.txt b/ydb/public/lib/value/CMakeLists.darwin-x86_64.txt
index bf3d5862d7..bf3d5862d7 100644
--- a/ydb/public/lib/value/CMakeLists.darwin.txt
+++ b/ydb/public/lib/value/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/value/CMakeLists.linux.txt b/ydb/public/lib/value/CMakeLists.linux-x86_64.txt
index bb738d2d13..bb738d2d13 100644
--- a/ydb/public/lib/value/CMakeLists.linux.txt
+++ b/ydb/public/lib/value/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/value/CMakeLists.txt b/ydb/public/lib/value/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/value/CMakeLists.txt
+++ b/ydb/public/lib/value/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/ydb_cli/commands/CMakeLists.darwin.txt b/ydb/public/lib/ydb_cli/commands/CMakeLists.darwin-x86_64.txt
index 0a0a67946b..0a0a67946b 100644
--- a/ydb/public/lib/ydb_cli/commands/CMakeLists.darwin.txt
+++ b/ydb/public/lib/ydb_cli/commands/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/commands/CMakeLists.linux.txt b/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-x86_64.txt
index 9ea855179b..9ea855179b 100644
--- a/ydb/public/lib/ydb_cli/commands/CMakeLists.linux.txt
+++ b/ydb/public/lib/ydb_cli/commands/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/commands/CMakeLists.txt b/ydb/public/lib/ydb_cli/commands/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/ydb_cli/commands/CMakeLists.txt
+++ b/ydb/public/lib/ydb_cli/commands/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/ydb_cli/common/CMakeLists.darwin.txt b/ydb/public/lib/ydb_cli/common/CMakeLists.darwin-x86_64.txt
index dd8b4338ee..dd8b4338ee 100644
--- a/ydb/public/lib/ydb_cli/common/CMakeLists.darwin.txt
+++ b/ydb/public/lib/ydb_cli/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/common/CMakeLists.linux.txt b/ydb/public/lib/ydb_cli/common/CMakeLists.linux-x86_64.txt
index 54e51dcdd4..54e51dcdd4 100644
--- a/ydb/public/lib/ydb_cli/common/CMakeLists.linux.txt
+++ b/ydb/public/lib/ydb_cli/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/common/CMakeLists.txt b/ydb/public/lib/ydb_cli/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/ydb_cli/common/CMakeLists.txt
+++ b/ydb/public/lib/ydb_cli/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/ydb_cli/common/ut/CMakeLists.darwin.txt b/ydb/public/lib/ydb_cli/common/ut/CMakeLists.darwin-x86_64.txt
index 5a2d7e6ccf..5a2d7e6ccf 100644
--- a/ydb/public/lib/ydb_cli/common/ut/CMakeLists.darwin.txt
+++ b/ydb/public/lib/ydb_cli/common/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/common/ut/CMakeLists.linux.txt b/ydb/public/lib/ydb_cli/common/ut/CMakeLists.linux-x86_64.txt
index 1fd3098a31..1fd3098a31 100644
--- a/ydb/public/lib/ydb_cli/common/ut/CMakeLists.linux.txt
+++ b/ydb/public/lib/ydb_cli/common/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/common/ut/CMakeLists.txt b/ydb/public/lib/ydb_cli/common/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/ydb_cli/common/ut/CMakeLists.txt
+++ b/ydb/public/lib/ydb_cli/common/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/ydb_cli/dump/CMakeLists.darwin.txt b/ydb/public/lib/ydb_cli/dump/CMakeLists.darwin-x86_64.txt
index a502b52604..a502b52604 100644
--- a/ydb/public/lib/ydb_cli/dump/CMakeLists.darwin.txt
+++ b/ydb/public/lib/ydb_cli/dump/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/dump/CMakeLists.linux.txt b/ydb/public/lib/ydb_cli/dump/CMakeLists.linux-x86_64.txt
index 73057a885c..73057a885c 100644
--- a/ydb/public/lib/ydb_cli/dump/CMakeLists.linux.txt
+++ b/ydb/public/lib/ydb_cli/dump/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/dump/CMakeLists.txt b/ydb/public/lib/ydb_cli/dump/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/ydb_cli/dump/CMakeLists.txt
+++ b/ydb/public/lib/ydb_cli/dump/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/ydb_cli/dump/util/CMakeLists.darwin.txt b/ydb/public/lib/ydb_cli/dump/util/CMakeLists.darwin-x86_64.txt
index c8ce5a5267..c8ce5a5267 100644
--- a/ydb/public/lib/ydb_cli/dump/util/CMakeLists.darwin.txt
+++ b/ydb/public/lib/ydb_cli/dump/util/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/dump/util/CMakeLists.linux.txt b/ydb/public/lib/ydb_cli/dump/util/CMakeLists.linux-x86_64.txt
index 312f9ebe0c..312f9ebe0c 100644
--- a/ydb/public/lib/ydb_cli/dump/util/CMakeLists.linux.txt
+++ b/ydb/public/lib/ydb_cli/dump/util/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/dump/util/CMakeLists.txt b/ydb/public/lib/ydb_cli/dump/util/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/ydb_cli/dump/util/CMakeLists.txt
+++ b/ydb/public/lib/ydb_cli/dump/util/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/ydb_cli/import/CMakeLists.darwin.txt b/ydb/public/lib/ydb_cli/import/CMakeLists.darwin-x86_64.txt
index 1dad1b91e6..1dad1b91e6 100644
--- a/ydb/public/lib/ydb_cli/import/CMakeLists.darwin.txt
+++ b/ydb/public/lib/ydb_cli/import/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/import/CMakeLists.linux.txt b/ydb/public/lib/ydb_cli/import/CMakeLists.linux-x86_64.txt
index 4a2102b575..4a2102b575 100644
--- a/ydb/public/lib/ydb_cli/import/CMakeLists.linux.txt
+++ b/ydb/public/lib/ydb_cli/import/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/import/CMakeLists.txt b/ydb/public/lib/ydb_cli/import/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/ydb_cli/import/CMakeLists.txt
+++ b/ydb/public/lib/ydb_cli/import/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/ydb_cli/topic/CMakeLists.darwin.txt b/ydb/public/lib/ydb_cli/topic/CMakeLists.darwin-x86_64.txt
index f16533cf39..f16533cf39 100644
--- a/ydb/public/lib/ydb_cli/topic/CMakeLists.darwin.txt
+++ b/ydb/public/lib/ydb_cli/topic/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/topic/CMakeLists.linux.txt b/ydb/public/lib/ydb_cli/topic/CMakeLists.linux-x86_64.txt
index c4e216ea63..c4e216ea63 100644
--- a/ydb/public/lib/ydb_cli/topic/CMakeLists.linux.txt
+++ b/ydb/public/lib/ydb_cli/topic/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/topic/CMakeLists.txt b/ydb/public/lib/ydb_cli/topic/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/ydb_cli/topic/CMakeLists.txt
+++ b/ydb/public/lib/ydb_cli/topic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.darwin.txt b/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.darwin-x86_64.txt
index cd2c31a6f9..cd2c31a6f9 100644
--- a/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.darwin.txt
+++ b/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.linux.txt b/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.linux-x86_64.txt
index 4c6aa707af..4c6aa707af 100644
--- a/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.linux.txt
+++ b/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.txt b/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.txt
+++ b/ydb/public/lib/ydb_cli/topic/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/yq/CMakeLists.darwin.txt b/ydb/public/lib/yq/CMakeLists.darwin-x86_64.txt
index 8b300f5e99..8b300f5e99 100644
--- a/ydb/public/lib/yq/CMakeLists.darwin.txt
+++ b/ydb/public/lib/yq/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/yq/CMakeLists.linux.txt b/ydb/public/lib/yq/CMakeLists.linux-x86_64.txt
index 943e57a7c0..943e57a7c0 100644
--- a/ydb/public/lib/yq/CMakeLists.linux.txt
+++ b/ydb/public/lib/yq/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/yq/CMakeLists.txt b/ydb/public/lib/yq/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/yq/CMakeLists.txt
+++ b/ydb/public/lib/yq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/lib/yson_value/CMakeLists.darwin.txt b/ydb/public/lib/yson_value/CMakeLists.darwin-x86_64.txt
index 269315ffd4..269315ffd4 100644
--- a/ydb/public/lib/yson_value/CMakeLists.darwin.txt
+++ b/ydb/public/lib/yson_value/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/lib/yson_value/CMakeLists.linux.txt b/ydb/public/lib/yson_value/CMakeLists.linux-x86_64.txt
index c7fea117db..c7fea117db 100644
--- a/ydb/public/lib/yson_value/CMakeLists.linux.txt
+++ b/ydb/public/lib/yson_value/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/lib/yson_value/CMakeLists.txt b/ydb/public/lib/yson_value/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/lib/yson_value/CMakeLists.txt
+++ b/ydb/public/lib/yson_value/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/draft/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/draft/CMakeLists.darwin-x86_64.txt
index 5697958846..5697958846 100644
--- a/ydb/public/sdk/cpp/client/draft/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/draft/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/draft/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/draft/CMakeLists.linux-x86_64.txt
index a3c961c33e..a3c961c33e 100644
--- a/ydb/public/sdk/cpp/client/draft/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/draft/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/draft/CMakeLists.txt b/ydb/public/sdk/cpp/client/draft/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/draft/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/draft/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.darwin-x86_64.txt
index e3266e754c..e3266e754c 100644
--- a/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.linux-x86_64.txt
index d655a4eeac..d655a4eeac 100644
--- a/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.darwin-x86_64.txt
index 4aa472691b..4aa472691b 100644
--- a/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.linux-x86_64.txt
index 57264527a0..57264527a0 100644
--- a/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.txt b/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/draft/ydb_query/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.darwin-x86_64.txt
index edd1d71816..edd1d71816 100644
--- a/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.linux-x86_64.txt
index d378e511ba..d378e511ba 100644
--- a/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.txt b/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/draft/ydb_query/impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.darwin-x86_64.txt
index c683afa9d9..c683afa9d9 100644
--- a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.linux-x86_64.txt
index a25c3f2565..a25c3f2565 100644
--- a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.txt b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.darwin-x86_64.txt
index f730a5575b..f730a5575b 100644
--- a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.linux-x86_64.txt
index 5cb0a919cf..5cb0a919cf 100644
--- a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.darwin-x86_64.txt
index 6ceecbe3fa..6ceecbe3fa 100644
--- a/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.linux-x86_64.txt
index d44b58e4a0..d44b58e4a0 100644
--- a/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.txt b/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/extensions/solomon_stats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/iam/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/iam/CMakeLists.darwin-x86_64.txt
index 62be1875e8..62be1875e8 100644
--- a/ydb/public/sdk/cpp/client/iam/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/iam/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/iam/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/iam/CMakeLists.linux-x86_64.txt
index e24b5fee8c..e24b5fee8c 100644
--- a/ydb/public/sdk/cpp/client/iam/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/iam/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/iam/CMakeLists.txt b/ydb/public/sdk/cpp/client/iam/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/iam/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/iam/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/iam/common/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/iam/common/CMakeLists.darwin-x86_64.txt
index 6023cc4d7a..6023cc4d7a 100644
--- a/ydb/public/sdk/cpp/client/iam/common/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/iam/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/iam/common/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/iam/common/CMakeLists.linux-x86_64.txt
index 0cbd8338cc..0cbd8338cc 100644
--- a/ydb/public/sdk/cpp/client/iam/common/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/iam/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/iam/common/CMakeLists.txt b/ydb/public/sdk/cpp/client/iam/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/iam/common/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/iam/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.darwin-x86_64.txt
index 120ee49bc0..120ee49bc0 100644
--- a/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.linux-x86_64.txt
index 8935e26790..8935e26790 100644
--- a/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.txt b/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/iam/impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/iam_private/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/iam_private/CMakeLists.darwin-x86_64.txt
index 808529d050..808529d050 100644
--- a/ydb/public/sdk/cpp/client/iam_private/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/iam_private/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/iam_private/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/iam_private/CMakeLists.linux-x86_64.txt
index ab0d5cb257..ab0d5cb257 100644
--- a/ydb/public/sdk/cpp/client/iam_private/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/iam_private/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/iam_private/CMakeLists.txt b/ydb/public/sdk/cpp/client/iam_private/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/iam_private/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/iam_private/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.darwin-x86_64.txt
index 38f3925add..38f3925add 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.linux-x86_64.txt
index 97783b6720..97783b6720 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.darwin-x86_64.txt
index 32bec14db9..32bec14db9 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.linux-x86_64.txt
index 49bcc6e2fb..49bcc6e2fb 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.darwin-x86_64.txt
index db531056fe..db531056fe 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.linux-x86_64.txt
index bcc55005d5..bcc55005d5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.darwin-x86_64.txt
index 5648c5c60d..5648c5c60d 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.linux-x86_64.txt
index 76c76abf6b..76c76abf6b 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/db_driver_state/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.darwin-x86_64.txt
index 3b38b5dd05..3b38b5dd05 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.linux-x86_64.txt
index 22b944a099..22b944a099 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/grpc_connections/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.darwin-x86_64.txt
index 5516de05f2..5516de05f2 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.linux-x86_64.txt
index 72bbb9c3fb..72bbb9c3fb 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/logger/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.darwin-x86_64.txt
index 7e1a72acfd..7e1a72acfd 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.linux-x86_64.txt
index 811ad6329b..811ad6329b 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/make_request/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.darwin-x86_64.txt
index af63d87c19..af63d87c19 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.linux-x86_64.txt
index b4e0edcb00..b4e0edcb00 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/plain_status/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.darwin-x86_64.txt
index 32bdede6c3..32bdede6c3 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.linux-x86_64.txt
index 1b6ec7ae97..1b6ec7ae97 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/thread_pool/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.darwin-x86_64.txt
index 66ef8dd6be..66ef8dd6be 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.linux-x86_64.txt
index 5b74a125f0..5b74a125f0 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_internal/value_helpers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.darwin-x86_64.txt
index a0f265545a..a0f265545a 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.linux-x86_64.txt
index faf260cc0d..faf260cc0d 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/impl/ydb_stats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/resources/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/resources/CMakeLists.darwin-x86_64.txt
index 563cc3de83..563cc3de83 100644
--- a/ydb/public/sdk/cpp/client/resources/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/resources/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/resources/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/resources/CMakeLists.linux-x86_64.txt
index a901fb410a..a901fb410a 100644
--- a/ydb/public/sdk/cpp/client/resources/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/resources/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/resources/CMakeLists.txt b/ydb/public/sdk/cpp/client/resources/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/resources/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/resources/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.darwin-x86_64.txt
index 6a76525e38..6a76525e38 100644
--- a/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.linux-x86_64.txt
index 173988d3f1..173988d3f1 100644
--- a/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_common_client/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.darwin-x86_64.txt
index 31eac1ee59..31eac1ee59 100644
--- a/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.linux-x86_64.txt
index 82f0fea6c1..82f0fea6c1 100644
--- a/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_common_client/impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.darwin-x86_64.txt
index 884937dbc6..884937dbc6 100644
--- a/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.linux-x86_64.txt
index b56f658682..b56f658682 100644
--- a/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_coordination/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.darwin-x86_64.txt
index 9c092c8c96..9c092c8c96 100644
--- a/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.linux-x86_64.txt
index f828b20df4..f828b20df4 100644
--- a/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.darwin-x86_64.txt
index 158789e802..158789e802 100644
--- a/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.linux-x86_64.txt
index c86ca4271f..c86ca4271f 100644
--- a/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_datastreams/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.darwin-x86_64.txt
index 94a3588bae..94a3588bae 100644
--- a/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.linux-x86_64.txt
index 5bee3a26ca..5bee3a26ca 100644
--- a/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_discovery/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.darwin-x86_64.txt
index a2ddf89edc..a2ddf89edc 100644
--- a/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.linux-x86_64.txt
index f126d65a8a..f126d65a8a 100644
--- a/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_driver/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.darwin-x86_64.txt
index 1ac0695e3a..1ac0695e3a 100644
--- a/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.linux-x86_64.txt
index 43368424d3..43368424d3 100644
--- a/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.darwin-x86_64.txt
index 5d233fd807..5d233fd807 100644
--- a/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.linux-x86_64.txt
index 201ade8b75..201ade8b75 100644
--- a/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_export/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.darwin-x86_64.txt
index 73c9f6df79..73c9f6df79 100644
--- a/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.linux-x86_64.txt
index 51e68871ee..51e68871ee 100644
--- a/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_extension/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.darwin-x86_64.txt
index ec38303961..ec38303961 100644
--- a/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.linux-x86_64.txt
index 428413d2dc..428413d2dc 100644
--- a/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_import/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.darwin-x86_64.txt
index 2b96035405..2b96035405 100644
--- a/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.linux-x86_64.txt
index cf9e695f35..cf9e695f35 100644
--- a/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_monitoring/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.darwin-x86_64.txt
index 00f201a783..00f201a783 100644
--- a/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.linux-x86_64.txt
index 753eb0a4a0..753eb0a4a0 100644
--- a/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_operation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.darwin-x86_64.txt
index 6e0baafca0..6e0baafca0 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-x86_64.txt
index 0f4a911f12..0f4a911f12 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.darwin-x86_64.txt
index 27192ce693..27192ce693 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.linux-x86_64.txt
index 9baff482c0..9baff482c0 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.darwin-x86_64.txt
index fab78335ee..fab78335ee 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.linux-x86_64.txt
index 6ac95f3166..6ac95f3166 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.darwin-x86_64.txt
index ed9156bb8a..ed9156bb8a 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.linux-x86_64.txt
index 27ae8ed56a..27ae8ed56a 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.darwin-x86_64.txt
index 6bf75a9932..6bf75a9932 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.linux-x86_64.txt
index 38d176d8c3..38d176d8c3 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-x86_64.txt
index 8dd05584d2..8dd05584d2 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-x86_64.txt
index 77be59e122..77be59e122 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-x86_64.txt
index fb07860625..fb07860625 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-x86_64.txt
index 4c180c1c63..4c180c1c63 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.darwin-x86_64.txt
index 4d63969baa..4d63969baa 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.linux-x86_64.txt
index 66a951e2cf..66a951e2cf 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_public/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.darwin-x86_64.txt
index 06fc4a13eb..06fc4a13eb 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.linux-x86_64.txt
index 47a2fe8b31..47a2fe8b31 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.darwin-x86_64.txt
index 430476e7ca..430476e7ca 100644
--- a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-x86_64.txt
index c44add7675..c44add7675 100644
--- a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.darwin-x86_64.txt
index 32ed89c22f..32ed89c22f 100644
--- a/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.linux-x86_64.txt
index fd6c181ed0..fd6c181ed0 100644
--- a/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_rate_limiter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.darwin-x86_64.txt
index 5fbb5097dd..5fbb5097dd 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-x86_64.txt
index daa99400b3..daa99400b3 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.darwin-x86_64.txt
index 66bd7dbd7d..66bd7dbd7d 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.linux-x86_64.txt
index 063e16dc96..063e16dc96 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.darwin-x86_64.txt
index 1c8c91c518..1c8c91c518 100644
--- a/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.linux-x86_64.txt
index 5a3b6c737d..5a3b6c737d 100644
--- a/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_scheme/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.darwin-x86_64.txt
index 5d35f202cc..5d35f202cc 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.linux-x86_64.txt
index cc4ba76506..cc4ba76506 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.darwin-x86_64.txt
index 50213bcb6f..50213bcb6f 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.linux-x86_64.txt
index 70b0b70fea..70b0b70fea 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.darwin-x86_64.txt
index 15f141ce6c..15f141ce6c 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.linux-x86_64.txt
index 093bc872cc..093bc872cc 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_table/query_stats/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.darwin-x86_64.txt
index efe49cc4b5..efe49cc4b5 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.linux-x86_64.txt
index 3de6140a52..3de6140a52 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.darwin-x86_64.txt
index a417b3b9cd..a417b3b9cd 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.linux-x86_64.txt
index fe17569b4f..fe17569b4f 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/codecs/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.darwin-x86_64.txt
index 5ecc4a1483..5ecc4a1483 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.linux-x86_64.txt
index 85e3be9d82..85e3be9d82 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.darwin-x86_64.txt
index 1d5d403b85..1d5d403b85 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.linux-x86_64.txt
index bb7d888fb2..bb7d888fb2 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_topic/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.darwin-x86_64.txt
index 830c62f0ed..830c62f0ed 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.linux-x86_64.txt
index 2734464370..2734464370 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.darwin-x86_64.txt
index 184183b011..184183b011 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.linux-x86_64.txt
index 49a91133f4..49a91133f4 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.darwin-x86_64.txt
index c2547bed27..c2547bed27 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.linux-x86_64.txt
index b1f1f97bc6..b1f1f97bc6 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/credentials/login/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.darwin-x86_64.txt
index 5ef919ffb1..5ef919ffb1 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.linux-x86_64.txt
index 018121da8c..018121da8c 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/exceptions/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.darwin-x86_64.txt
index 49bdf0c926..49bdf0c926 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.linux-x86_64.txt
index f72ba5ae39..f72ba5ae39 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/fatal_error_handlers/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.darwin-x86_64.txt
index a026d246d6..a026d246d6 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.linux-x86_64.txt
index 15a7c8f444..15a7c8f444 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/operation/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.darwin-x86_64.txt
index 2d15ee09be..2d15ee09be 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.linux-x86_64.txt
index 34d6c9ca5f..34d6c9ca5f 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_types/status/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.darwin-x86_64.txt
index 1f45b95608..1f45b95608 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-x86_64.txt
index e29173bf38..e29173bf38 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.darwin-x86_64.txt
index 0def64b607..0def64b607 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.linux.txt b/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.linux-x86_64.txt
index 1174601b7e..1174601b7e 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.darwin-x86_64.txt
index 0fbc9cd936..0fbc9cd936 100644
--- a/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.linux.txt b/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.linux-x86_64.txt
index 7d2c6cbaad..7d2c6cbaad 100644
--- a/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.txt b/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.darwin-x86_64.txt
index 2417a963c1..2417a963c1 100644
--- a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.linux.txt b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.linux-x86_64.txt
index 08665a69e4..08665a69e4 100644
--- a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.txt b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/examples/pagination/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/examples/pagination/CMakeLists.darwin-x86_64.txt
index 000faeeca0..000faeeca0 100644
--- a/ydb/public/sdk/cpp/examples/pagination/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/examples/pagination/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/pagination/CMakeLists.linux.txt b/ydb/public/sdk/cpp/examples/pagination/CMakeLists.linux-x86_64.txt
index d123135d35..d123135d35 100644
--- a/ydb/public/sdk/cpp/examples/pagination/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/examples/pagination/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/pagination/CMakeLists.txt b/ydb/public/sdk/cpp/examples/pagination/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/examples/pagination/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/examples/pagination/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.darwin-x86_64.txt
index 8e2e9f88d4..8e2e9f88d4 100644
--- a/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.linux.txt b/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.linux-x86_64.txt
index 6f51ec1d82..6f51ec1d82 100644
--- a/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.txt b/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.darwin-x86_64.txt
index 251f5a0058..251f5a0058 100644
--- a/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.linux.txt b/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.linux-x86_64.txt
index 076cd9d5ed..076cd9d5ed 100644
--- a/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.txt b/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.darwin-x86_64.txt
index 314760606d..314760606d 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.linux.txt b/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.linux-x86_64.txt
index 6b6c090261..6b6c090261 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.txt b/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/examples/topic_reader/eventloop/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.darwin-x86_64.txt
index a6af650f32..a6af650f32 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.linux.txt b/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.linux-x86_64.txt
index e7d38c64ed..e7d38c64ed 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.txt b/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/examples/topic_reader/simple/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/public/sdk/cpp/examples/ttl/CMakeLists.darwin.txt b/ydb/public/sdk/cpp/examples/ttl/CMakeLists.darwin-x86_64.txt
index 964e335c80..964e335c80 100644
--- a/ydb/public/sdk/cpp/examples/ttl/CMakeLists.darwin.txt
+++ b/ydb/public/sdk/cpp/examples/ttl/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/ttl/CMakeLists.linux.txt b/ydb/public/sdk/cpp/examples/ttl/CMakeLists.linux-x86_64.txt
index e008bcdb20..e008bcdb20 100644
--- a/ydb/public/sdk/cpp/examples/ttl/CMakeLists.linux.txt
+++ b/ydb/public/sdk/cpp/examples/ttl/CMakeLists.linux-x86_64.txt
diff --git a/ydb/public/sdk/cpp/examples/ttl/CMakeLists.txt b/ydb/public/sdk/cpp/examples/ttl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/public/sdk/cpp/examples/ttl/CMakeLists.txt
+++ b/ydb/public/sdk/cpp/examples/ttl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/auth/CMakeLists.darwin.txt b/ydb/services/auth/CMakeLists.darwin-x86_64.txt
index 76acb24ce6..76acb24ce6 100644
--- a/ydb/services/auth/CMakeLists.darwin.txt
+++ b/ydb/services/auth/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/auth/CMakeLists.linux.txt b/ydb/services/auth/CMakeLists.linux-x86_64.txt
index ebffcaf3b2..ebffcaf3b2 100644
--- a/ydb/services/auth/CMakeLists.linux.txt
+++ b/ydb/services/auth/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/auth/CMakeLists.txt b/ydb/services/auth/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/auth/CMakeLists.txt
+++ b/ydb/services/auth/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/bg_tasks/CMakeLists.darwin.txt b/ydb/services/bg_tasks/CMakeLists.darwin-x86_64.txt
index e2cdd8fbf4..e2cdd8fbf4 100644
--- a/ydb/services/bg_tasks/CMakeLists.darwin.txt
+++ b/ydb/services/bg_tasks/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/bg_tasks/CMakeLists.linux.txt b/ydb/services/bg_tasks/CMakeLists.linux-x86_64.txt
index 9989b2b98d..9989b2b98d 100644
--- a/ydb/services/bg_tasks/CMakeLists.linux.txt
+++ b/ydb/services/bg_tasks/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/bg_tasks/CMakeLists.txt b/ydb/services/bg_tasks/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/bg_tasks/CMakeLists.txt
+++ b/ydb/services/bg_tasks/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/bg_tasks/abstract/CMakeLists.darwin.txt b/ydb/services/bg_tasks/abstract/CMakeLists.darwin-x86_64.txt
index b0488020e3..b0488020e3 100644
--- a/ydb/services/bg_tasks/abstract/CMakeLists.darwin.txt
+++ b/ydb/services/bg_tasks/abstract/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/bg_tasks/abstract/CMakeLists.linux.txt b/ydb/services/bg_tasks/abstract/CMakeLists.linux-x86_64.txt
index b4abb4f223..b4abb4f223 100644
--- a/ydb/services/bg_tasks/abstract/CMakeLists.linux.txt
+++ b/ydb/services/bg_tasks/abstract/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/bg_tasks/abstract/CMakeLists.txt b/ydb/services/bg_tasks/abstract/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/bg_tasks/abstract/CMakeLists.txt
+++ b/ydb/services/bg_tasks/abstract/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/bg_tasks/ds_table/CMakeLists.darwin.txt b/ydb/services/bg_tasks/ds_table/CMakeLists.darwin-x86_64.txt
index 06ef95a09c..06ef95a09c 100644
--- a/ydb/services/bg_tasks/ds_table/CMakeLists.darwin.txt
+++ b/ydb/services/bg_tasks/ds_table/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/bg_tasks/ds_table/CMakeLists.linux.txt b/ydb/services/bg_tasks/ds_table/CMakeLists.linux-x86_64.txt
index e2ff9b84df..e2ff9b84df 100644
--- a/ydb/services/bg_tasks/ds_table/CMakeLists.linux.txt
+++ b/ydb/services/bg_tasks/ds_table/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/bg_tasks/ds_table/CMakeLists.txt b/ydb/services/bg_tasks/ds_table/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/bg_tasks/ds_table/CMakeLists.txt
+++ b/ydb/services/bg_tasks/ds_table/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/bg_tasks/protos/CMakeLists.darwin.txt b/ydb/services/bg_tasks/protos/CMakeLists.darwin-x86_64.txt
index cec47cc18b..cec47cc18b 100644
--- a/ydb/services/bg_tasks/protos/CMakeLists.darwin.txt
+++ b/ydb/services/bg_tasks/protos/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/bg_tasks/protos/CMakeLists.linux.txt b/ydb/services/bg_tasks/protos/CMakeLists.linux-x86_64.txt
index 792e0c2f9a..792e0c2f9a 100644
--- a/ydb/services/bg_tasks/protos/CMakeLists.linux.txt
+++ b/ydb/services/bg_tasks/protos/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/bg_tasks/protos/CMakeLists.txt b/ydb/services/bg_tasks/protos/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/bg_tasks/protos/CMakeLists.txt
+++ b/ydb/services/bg_tasks/protos/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/bg_tasks/ut/CMakeLists.darwin.txt b/ydb/services/bg_tasks/ut/CMakeLists.darwin-x86_64.txt
index 198eb95a02..198eb95a02 100644
--- a/ydb/services/bg_tasks/ut/CMakeLists.darwin.txt
+++ b/ydb/services/bg_tasks/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/bg_tasks/ut/CMakeLists.linux.txt b/ydb/services/bg_tasks/ut/CMakeLists.linux-x86_64.txt
index 3cb21cb46a..3cb21cb46a 100644
--- a/ydb/services/bg_tasks/ut/CMakeLists.linux.txt
+++ b/ydb/services/bg_tasks/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/bg_tasks/ut/CMakeLists.txt b/ydb/services/bg_tasks/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/bg_tasks/ut/CMakeLists.txt
+++ b/ydb/services/bg_tasks/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/cms/CMakeLists.darwin.txt b/ydb/services/cms/CMakeLists.darwin-x86_64.txt
index e30816acba..e30816acba 100644
--- a/ydb/services/cms/CMakeLists.darwin.txt
+++ b/ydb/services/cms/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/cms/CMakeLists.linux.txt b/ydb/services/cms/CMakeLists.linux-x86_64.txt
index d1435f6812..d1435f6812 100644
--- a/ydb/services/cms/CMakeLists.linux.txt
+++ b/ydb/services/cms/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/cms/CMakeLists.txt b/ydb/services/cms/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/cms/CMakeLists.txt
+++ b/ydb/services/cms/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/cms/ut/CMakeLists.darwin.txt b/ydb/services/cms/ut/CMakeLists.darwin-x86_64.txt
index ad2f923975..ad2f923975 100644
--- a/ydb/services/cms/ut/CMakeLists.darwin.txt
+++ b/ydb/services/cms/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/cms/ut/CMakeLists.linux.txt b/ydb/services/cms/ut/CMakeLists.linux-x86_64.txt
index 9fdd116431..9fdd116431 100644
--- a/ydb/services/cms/ut/CMakeLists.linux.txt
+++ b/ydb/services/cms/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/cms/ut/CMakeLists.txt b/ydb/services/cms/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/cms/ut/CMakeLists.txt
+++ b/ydb/services/cms/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/datastreams/CMakeLists.darwin.txt b/ydb/services/datastreams/CMakeLists.darwin-x86_64.txt
index 4164eb9cc5..4164eb9cc5 100644
--- a/ydb/services/datastreams/CMakeLists.darwin.txt
+++ b/ydb/services/datastreams/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/datastreams/CMakeLists.linux.txt b/ydb/services/datastreams/CMakeLists.linux-x86_64.txt
index d4b992031e..d4b992031e 100644
--- a/ydb/services/datastreams/CMakeLists.linux.txt
+++ b/ydb/services/datastreams/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/datastreams/CMakeLists.txt b/ydb/services/datastreams/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/datastreams/CMakeLists.txt
+++ b/ydb/services/datastreams/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/datastreams/ut/CMakeLists.darwin.txt b/ydb/services/datastreams/ut/CMakeLists.darwin-x86_64.txt
index ba893453cf..ba893453cf 100644
--- a/ydb/services/datastreams/ut/CMakeLists.darwin.txt
+++ b/ydb/services/datastreams/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/datastreams/ut/CMakeLists.linux.txt b/ydb/services/datastreams/ut/CMakeLists.linux-x86_64.txt
index a26b5e3341..a26b5e3341 100644
--- a/ydb/services/datastreams/ut/CMakeLists.linux.txt
+++ b/ydb/services/datastreams/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/datastreams/ut/CMakeLists.txt b/ydb/services/datastreams/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/datastreams/ut/CMakeLists.txt
+++ b/ydb/services/datastreams/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/discovery/CMakeLists.darwin.txt b/ydb/services/discovery/CMakeLists.darwin-x86_64.txt
index 74cf45c696..74cf45c696 100644
--- a/ydb/services/discovery/CMakeLists.darwin.txt
+++ b/ydb/services/discovery/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/discovery/CMakeLists.linux.txt b/ydb/services/discovery/CMakeLists.linux-x86_64.txt
index d1f17dc660..d1f17dc660 100644
--- a/ydb/services/discovery/CMakeLists.linux.txt
+++ b/ydb/services/discovery/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/discovery/CMakeLists.txt b/ydb/services/discovery/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/discovery/CMakeLists.txt
+++ b/ydb/services/discovery/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/fq/CMakeLists.darwin.txt b/ydb/services/fq/CMakeLists.darwin-x86_64.txt
index c67ad93dea..c67ad93dea 100644
--- a/ydb/services/fq/CMakeLists.darwin.txt
+++ b/ydb/services/fq/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/fq/CMakeLists.linux.txt b/ydb/services/fq/CMakeLists.linux-x86_64.txt
index 4d3b83da14..4d3b83da14 100644
--- a/ydb/services/fq/CMakeLists.linux.txt
+++ b/ydb/services/fq/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/fq/CMakeLists.txt b/ydb/services/fq/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/fq/CMakeLists.txt
+++ b/ydb/services/fq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/fq/ut_integration/CMakeLists.darwin.txt b/ydb/services/fq/ut_integration/CMakeLists.darwin-x86_64.txt
index 063c5d8e49..063c5d8e49 100644
--- a/ydb/services/fq/ut_integration/CMakeLists.darwin.txt
+++ b/ydb/services/fq/ut_integration/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/fq/ut_integration/CMakeLists.linux.txt b/ydb/services/fq/ut_integration/CMakeLists.linux-x86_64.txt
index 2f3410416a..2f3410416a 100644
--- a/ydb/services/fq/ut_integration/CMakeLists.linux.txt
+++ b/ydb/services/fq/ut_integration/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/fq/ut_integration/CMakeLists.txt b/ydb/services/fq/ut_integration/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/fq/ut_integration/CMakeLists.txt
+++ b/ydb/services/fq/ut_integration/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/kesus/CMakeLists.darwin.txt b/ydb/services/kesus/CMakeLists.darwin-x86_64.txt
index 68fe7d7a7b..68fe7d7a7b 100644
--- a/ydb/services/kesus/CMakeLists.darwin.txt
+++ b/ydb/services/kesus/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/kesus/CMakeLists.linux.txt b/ydb/services/kesus/CMakeLists.linux-x86_64.txt
index 49d5397f10..49d5397f10 100644
--- a/ydb/services/kesus/CMakeLists.linux.txt
+++ b/ydb/services/kesus/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/kesus/CMakeLists.txt b/ydb/services/kesus/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/kesus/CMakeLists.txt
+++ b/ydb/services/kesus/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/lib/actors/CMakeLists.darwin.txt b/ydb/services/lib/actors/CMakeLists.darwin-x86_64.txt
index 43f92f2ff0..43f92f2ff0 100644
--- a/ydb/services/lib/actors/CMakeLists.darwin.txt
+++ b/ydb/services/lib/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/lib/actors/CMakeLists.linux.txt b/ydb/services/lib/actors/CMakeLists.linux-x86_64.txt
index 0c6cdd98c9..0c6cdd98c9 100644
--- a/ydb/services/lib/actors/CMakeLists.linux.txt
+++ b/ydb/services/lib/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/lib/actors/CMakeLists.txt b/ydb/services/lib/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/lib/actors/CMakeLists.txt
+++ b/ydb/services/lib/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/lib/sharding/CMakeLists.darwin.txt b/ydb/services/lib/sharding/CMakeLists.darwin-x86_64.txt
index c9402ccce0..c9402ccce0 100644
--- a/ydb/services/lib/sharding/CMakeLists.darwin.txt
+++ b/ydb/services/lib/sharding/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/lib/sharding/CMakeLists.linux.txt b/ydb/services/lib/sharding/CMakeLists.linux-x86_64.txt
index 1d3a7bf20b..1d3a7bf20b 100644
--- a/ydb/services/lib/sharding/CMakeLists.linux.txt
+++ b/ydb/services/lib/sharding/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/lib/sharding/CMakeLists.txt b/ydb/services/lib/sharding/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/lib/sharding/CMakeLists.txt
+++ b/ydb/services/lib/sharding/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/local_discovery/CMakeLists.darwin.txt b/ydb/services/local_discovery/CMakeLists.darwin-x86_64.txt
index 961750ce61..961750ce61 100644
--- a/ydb/services/local_discovery/CMakeLists.darwin.txt
+++ b/ydb/services/local_discovery/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/local_discovery/CMakeLists.linux.txt b/ydb/services/local_discovery/CMakeLists.linux-x86_64.txt
index a04f5b1db7..a04f5b1db7 100644
--- a/ydb/services/local_discovery/CMakeLists.linux.txt
+++ b/ydb/services/local_discovery/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/local_discovery/CMakeLists.txt b/ydb/services/local_discovery/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/local_discovery/CMakeLists.txt
+++ b/ydb/services/local_discovery/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/CMakeLists.darwin.txt b/ydb/services/metadata/CMakeLists.darwin-x86_64.txt
index 442b5d20d0..442b5d20d0 100644
--- a/ydb/services/metadata/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/CMakeLists.linux.txt b/ydb/services/metadata/CMakeLists.linux-x86_64.txt
index 85e5dadaf1..85e5dadaf1 100644
--- a/ydb/services/metadata/CMakeLists.linux.txt
+++ b/ydb/services/metadata/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/CMakeLists.txt b/ydb/services/metadata/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/CMakeLists.txt
+++ b/ydb/services/metadata/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/abstract/CMakeLists.darwin.txt b/ydb/services/metadata/abstract/CMakeLists.darwin-x86_64.txt
index 42d363b209..42d363b209 100644
--- a/ydb/services/metadata/abstract/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/abstract/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/abstract/CMakeLists.linux.txt b/ydb/services/metadata/abstract/CMakeLists.linux-x86_64.txt
index 1d6133cd26..1d6133cd26 100644
--- a/ydb/services/metadata/abstract/CMakeLists.linux.txt
+++ b/ydb/services/metadata/abstract/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/abstract/CMakeLists.txt b/ydb/services/metadata/abstract/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/abstract/CMakeLists.txt
+++ b/ydb/services/metadata/abstract/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/common/CMakeLists.darwin.txt b/ydb/services/metadata/common/CMakeLists.darwin-x86_64.txt
index 51b3c639ae..51b3c639ae 100644
--- a/ydb/services/metadata/common/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/common/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/common/CMakeLists.linux.txt b/ydb/services/metadata/common/CMakeLists.linux-x86_64.txt
index 85d0145326..85d0145326 100644
--- a/ydb/services/metadata/common/CMakeLists.linux.txt
+++ b/ydb/services/metadata/common/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/common/CMakeLists.txt b/ydb/services/metadata/common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/common/CMakeLists.txt
+++ b/ydb/services/metadata/common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/ds_table/CMakeLists.darwin.txt b/ydb/services/metadata/ds_table/CMakeLists.darwin-x86_64.txt
index fb3012d69e..fb3012d69e 100644
--- a/ydb/services/metadata/ds_table/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/ds_table/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/ds_table/CMakeLists.linux.txt b/ydb/services/metadata/ds_table/CMakeLists.linux-x86_64.txt
index f6e60135e8..f6e60135e8 100644
--- a/ydb/services/metadata/ds_table/CMakeLists.linux.txt
+++ b/ydb/services/metadata/ds_table/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/ds_table/CMakeLists.txt b/ydb/services/metadata/ds_table/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/ds_table/CMakeLists.txt
+++ b/ydb/services/metadata/ds_table/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/initializer/CMakeLists.darwin.txt b/ydb/services/metadata/initializer/CMakeLists.darwin-x86_64.txt
index fef7600420..fef7600420 100644
--- a/ydb/services/metadata/initializer/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/initializer/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/initializer/CMakeLists.linux.txt b/ydb/services/metadata/initializer/CMakeLists.linux-x86_64.txt
index 2623584897..2623584897 100644
--- a/ydb/services/metadata/initializer/CMakeLists.linux.txt
+++ b/ydb/services/metadata/initializer/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/initializer/CMakeLists.txt b/ydb/services/metadata/initializer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/initializer/CMakeLists.txt
+++ b/ydb/services/metadata/initializer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/initializer/ut/CMakeLists.darwin.txt b/ydb/services/metadata/initializer/ut/CMakeLists.darwin-x86_64.txt
index cb1ef0a375..cb1ef0a375 100644
--- a/ydb/services/metadata/initializer/ut/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/initializer/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/initializer/ut/CMakeLists.linux.txt b/ydb/services/metadata/initializer/ut/CMakeLists.linux-x86_64.txt
index 1537548bf1..1537548bf1 100644
--- a/ydb/services/metadata/initializer/ut/CMakeLists.linux.txt
+++ b/ydb/services/metadata/initializer/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/initializer/ut/CMakeLists.txt b/ydb/services/metadata/initializer/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/initializer/ut/CMakeLists.txt
+++ b/ydb/services/metadata/initializer/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/manager/CMakeLists.darwin.txt b/ydb/services/metadata/manager/CMakeLists.darwin-x86_64.txt
index 59e5adbc08..59e5adbc08 100644
--- a/ydb/services/metadata/manager/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/manager/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/manager/CMakeLists.linux.txt b/ydb/services/metadata/manager/CMakeLists.linux-x86_64.txt
index c62556c718..c62556c718 100644
--- a/ydb/services/metadata/manager/CMakeLists.linux.txt
+++ b/ydb/services/metadata/manager/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/manager/CMakeLists.txt b/ydb/services/metadata/manager/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/manager/CMakeLists.txt
+++ b/ydb/services/metadata/manager/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/request/CMakeLists.darwin.txt b/ydb/services/metadata/request/CMakeLists.darwin-x86_64.txt
index 378762b122..378762b122 100644
--- a/ydb/services/metadata/request/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/request/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/request/CMakeLists.linux.txt b/ydb/services/metadata/request/CMakeLists.linux-x86_64.txt
index dcb34e402b..dcb34e402b 100644
--- a/ydb/services/metadata/request/CMakeLists.linux.txt
+++ b/ydb/services/metadata/request/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/request/CMakeLists.txt b/ydb/services/metadata/request/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/request/CMakeLists.txt
+++ b/ydb/services/metadata/request/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/secret/CMakeLists.darwin.txt b/ydb/services/metadata/secret/CMakeLists.darwin-x86_64.txt
index 7659c8ae97..7659c8ae97 100644
--- a/ydb/services/metadata/secret/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/secret/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/secret/CMakeLists.linux.txt b/ydb/services/metadata/secret/CMakeLists.linux-x86_64.txt
index afee708308..afee708308 100644
--- a/ydb/services/metadata/secret/CMakeLists.linux.txt
+++ b/ydb/services/metadata/secret/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/secret/CMakeLists.txt b/ydb/services/metadata/secret/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/secret/CMakeLists.txt
+++ b/ydb/services/metadata/secret/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/metadata/secret/ut/CMakeLists.darwin.txt b/ydb/services/metadata/secret/ut/CMakeLists.darwin-x86_64.txt
index 2f3fb8327f..2f3fb8327f 100644
--- a/ydb/services/metadata/secret/ut/CMakeLists.darwin.txt
+++ b/ydb/services/metadata/secret/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/metadata/secret/ut/CMakeLists.linux.txt b/ydb/services/metadata/secret/ut/CMakeLists.linux-x86_64.txt
index 39336c1b51..39336c1b51 100644
--- a/ydb/services/metadata/secret/ut/CMakeLists.linux.txt
+++ b/ydb/services/metadata/secret/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/metadata/secret/ut/CMakeLists.txt b/ydb/services/metadata/secret/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/metadata/secret/ut/CMakeLists.txt
+++ b/ydb/services/metadata/secret/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/monitoring/CMakeLists.darwin.txt b/ydb/services/monitoring/CMakeLists.darwin-x86_64.txt
index d788e414ac..d788e414ac 100644
--- a/ydb/services/monitoring/CMakeLists.darwin.txt
+++ b/ydb/services/monitoring/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/monitoring/CMakeLists.linux.txt b/ydb/services/monitoring/CMakeLists.linux-x86_64.txt
index a4f761c24d..a4f761c24d 100644
--- a/ydb/services/monitoring/CMakeLists.linux.txt
+++ b/ydb/services/monitoring/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/monitoring/CMakeLists.txt b/ydb/services/monitoring/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/monitoring/CMakeLists.txt
+++ b/ydb/services/monitoring/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/persqueue_cluster_discovery/CMakeLists.darwin.txt b/ydb/services/persqueue_cluster_discovery/CMakeLists.darwin-x86_64.txt
index 39d1af5bf5..39d1af5bf5 100644
--- a/ydb/services/persqueue_cluster_discovery/CMakeLists.darwin.txt
+++ b/ydb/services/persqueue_cluster_discovery/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/persqueue_cluster_discovery/CMakeLists.linux.txt b/ydb/services/persqueue_cluster_discovery/CMakeLists.linux-x86_64.txt
index 943ee24692..943ee24692 100644
--- a/ydb/services/persqueue_cluster_discovery/CMakeLists.linux.txt
+++ b/ydb/services/persqueue_cluster_discovery/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/persqueue_cluster_discovery/CMakeLists.txt b/ydb/services/persqueue_cluster_discovery/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/persqueue_cluster_discovery/CMakeLists.txt
+++ b/ydb/services/persqueue_cluster_discovery/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.darwin.txt b/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.darwin-x86_64.txt
index d7ebeadd29..d7ebeadd29 100644
--- a/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.darwin.txt
+++ b/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.linux.txt b/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.linux-x86_64.txt
index 34a534c1fe..34a534c1fe 100644
--- a/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.linux.txt
+++ b/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.txt b/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.txt
+++ b/ydb/services/persqueue_cluster_discovery/cluster_ordering/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.darwin.txt b/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.darwin-x86_64.txt
index 1fe11487db..1fe11487db 100644
--- a/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.darwin.txt
+++ b/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.linux.txt b/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.linux-x86_64.txt
index 0a1267128d..0a1267128d 100644
--- a/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.linux.txt
+++ b/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.txt b/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.txt
+++ b/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/persqueue_v1/CMakeLists.darwin.txt b/ydb/services/persqueue_v1/CMakeLists.darwin-x86_64.txt
index 60e563ec2e..60e563ec2e 100644
--- a/ydb/services/persqueue_v1/CMakeLists.darwin.txt
+++ b/ydb/services/persqueue_v1/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/persqueue_v1/CMakeLists.linux.txt b/ydb/services/persqueue_v1/CMakeLists.linux-x86_64.txt
index 35c5bb019b..35c5bb019b 100644
--- a/ydb/services/persqueue_v1/CMakeLists.linux.txt
+++ b/ydb/services/persqueue_v1/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/persqueue_v1/CMakeLists.txt b/ydb/services/persqueue_v1/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/persqueue_v1/CMakeLists.txt
+++ b/ydb/services/persqueue_v1/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/persqueue_v1/actors/CMakeLists.darwin.txt b/ydb/services/persqueue_v1/actors/CMakeLists.darwin-x86_64.txt
index 0a9aa85772..0a9aa85772 100644
--- a/ydb/services/persqueue_v1/actors/CMakeLists.darwin.txt
+++ b/ydb/services/persqueue_v1/actors/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/persqueue_v1/actors/CMakeLists.linux.txt b/ydb/services/persqueue_v1/actors/CMakeLists.linux-x86_64.txt
index 7c0aa49098..7c0aa49098 100644
--- a/ydb/services/persqueue_v1/actors/CMakeLists.linux.txt
+++ b/ydb/services/persqueue_v1/actors/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/persqueue_v1/actors/CMakeLists.txt b/ydb/services/persqueue_v1/actors/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/persqueue_v1/actors/CMakeLists.txt
+++ b/ydb/services/persqueue_v1/actors/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/persqueue_v1/ut/CMakeLists.darwin.txt b/ydb/services/persqueue_v1/ut/CMakeLists.darwin-x86_64.txt
index 987721454a..987721454a 100644
--- a/ydb/services/persqueue_v1/ut/CMakeLists.darwin.txt
+++ b/ydb/services/persqueue_v1/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/persqueue_v1/ut/CMakeLists.linux.txt b/ydb/services/persqueue_v1/ut/CMakeLists.linux-x86_64.txt
index 3a1127dc2e..3a1127dc2e 100644
--- a/ydb/services/persqueue_v1/ut/CMakeLists.linux.txt
+++ b/ydb/services/persqueue_v1/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/persqueue_v1/ut/CMakeLists.txt b/ydb/services/persqueue_v1/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/persqueue_v1/ut/CMakeLists.txt
+++ b/ydb/services/persqueue_v1/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.darwin.txt b/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.darwin-x86_64.txt
index a60ea255c5..a60ea255c5 100644
--- a/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.darwin.txt
+++ b/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.linux.txt b/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.linux-x86_64.txt
index 3588630994..3588630994 100644
--- a/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.linux.txt
+++ b/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.txt b/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.txt
+++ b/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/rate_limiter/CMakeLists.darwin.txt b/ydb/services/rate_limiter/CMakeLists.darwin-x86_64.txt
index 51bafd9703..51bafd9703 100644
--- a/ydb/services/rate_limiter/CMakeLists.darwin.txt
+++ b/ydb/services/rate_limiter/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/rate_limiter/CMakeLists.linux.txt b/ydb/services/rate_limiter/CMakeLists.linux-x86_64.txt
index c00cdc1258..c00cdc1258 100644
--- a/ydb/services/rate_limiter/CMakeLists.linux.txt
+++ b/ydb/services/rate_limiter/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/rate_limiter/CMakeLists.txt b/ydb/services/rate_limiter/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/rate_limiter/CMakeLists.txt
+++ b/ydb/services/rate_limiter/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/rate_limiter/ut/CMakeLists.darwin.txt b/ydb/services/rate_limiter/ut/CMakeLists.darwin-x86_64.txt
index b893839120..b893839120 100644
--- a/ydb/services/rate_limiter/ut/CMakeLists.darwin.txt
+++ b/ydb/services/rate_limiter/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/rate_limiter/ut/CMakeLists.linux.txt b/ydb/services/rate_limiter/ut/CMakeLists.linux-x86_64.txt
index 16e3f12c3a..16e3f12c3a 100644
--- a/ydb/services/rate_limiter/ut/CMakeLists.linux.txt
+++ b/ydb/services/rate_limiter/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/rate_limiter/ut/CMakeLists.txt b/ydb/services/rate_limiter/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/rate_limiter/ut/CMakeLists.txt
+++ b/ydb/services/rate_limiter/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/ydb/CMakeLists.darwin.txt b/ydb/services/ydb/CMakeLists.darwin-x86_64.txt
index 813d577ed8..813d577ed8 100644
--- a/ydb/services/ydb/CMakeLists.darwin.txt
+++ b/ydb/services/ydb/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/ydb/CMakeLists.linux.txt b/ydb/services/ydb/CMakeLists.linux-x86_64.txt
index 2f77c61e3d..2f77c61e3d 100644
--- a/ydb/services/ydb/CMakeLists.linux.txt
+++ b/ydb/services/ydb/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/ydb/CMakeLists.txt b/ydb/services/ydb/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/ydb/CMakeLists.txt
+++ b/ydb/services/ydb/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/ydb/index_ut/CMakeLists.darwin.txt b/ydb/services/ydb/index_ut/CMakeLists.darwin-x86_64.txt
index 32860f13af..32860f13af 100644
--- a/ydb/services/ydb/index_ut/CMakeLists.darwin.txt
+++ b/ydb/services/ydb/index_ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/ydb/index_ut/CMakeLists.linux.txt b/ydb/services/ydb/index_ut/CMakeLists.linux-x86_64.txt
index 034abcfc0d..034abcfc0d 100644
--- a/ydb/services/ydb/index_ut/CMakeLists.linux.txt
+++ b/ydb/services/ydb/index_ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/ydb/index_ut/CMakeLists.txt b/ydb/services/ydb/index_ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/ydb/index_ut/CMakeLists.txt
+++ b/ydb/services/ydb/index_ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.darwin.txt b/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.darwin-x86_64.txt
index abcde38552..abcde38552 100644
--- a/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.darwin.txt
+++ b/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.linux.txt b/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.linux-x86_64.txt
index cc3fb66656..cc3fb66656 100644
--- a/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.linux.txt
+++ b/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.txt b/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.txt
+++ b/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/ydb/sdk_sessions_ut/CMakeLists.darwin.txt b/ydb/services/ydb/sdk_sessions_ut/CMakeLists.darwin-x86_64.txt
index a55fad0b0d..a55fad0b0d 100644
--- a/ydb/services/ydb/sdk_sessions_ut/CMakeLists.darwin.txt
+++ b/ydb/services/ydb/sdk_sessions_ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/ydb/sdk_sessions_ut/CMakeLists.linux.txt b/ydb/services/ydb/sdk_sessions_ut/CMakeLists.linux-x86_64.txt
index 632434c626..632434c626 100644
--- a/ydb/services/ydb/sdk_sessions_ut/CMakeLists.linux.txt
+++ b/ydb/services/ydb/sdk_sessions_ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/ydb/sdk_sessions_ut/CMakeLists.txt b/ydb/services/ydb/sdk_sessions_ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/ydb/sdk_sessions_ut/CMakeLists.txt
+++ b/ydb/services/ydb/sdk_sessions_ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/ydb/table_split_ut/CMakeLists.darwin.txt b/ydb/services/ydb/table_split_ut/CMakeLists.darwin-x86_64.txt
index 8a628e8d19..8a628e8d19 100644
--- a/ydb/services/ydb/table_split_ut/CMakeLists.darwin.txt
+++ b/ydb/services/ydb/table_split_ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/ydb/table_split_ut/CMakeLists.linux.txt b/ydb/services/ydb/table_split_ut/CMakeLists.linux-x86_64.txt
index 9069333a7f..9069333a7f 100644
--- a/ydb/services/ydb/table_split_ut/CMakeLists.linux.txt
+++ b/ydb/services/ydb/table_split_ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/ydb/table_split_ut/CMakeLists.txt b/ydb/services/ydb/table_split_ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/ydb/table_split_ut/CMakeLists.txt
+++ b/ydb/services/ydb/table_split_ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/ydb/ut/CMakeLists.darwin.txt b/ydb/services/ydb/ut/CMakeLists.darwin-x86_64.txt
index 9fa111163f..9fa111163f 100644
--- a/ydb/services/ydb/ut/CMakeLists.darwin.txt
+++ b/ydb/services/ydb/ut/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/ydb/ut/CMakeLists.linux.txt b/ydb/services/ydb/ut/CMakeLists.linux-x86_64.txt
index 0afdec62bc..0afdec62bc 100644
--- a/ydb/services/ydb/ut/CMakeLists.linux.txt
+++ b/ydb/services/ydb/ut/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/ydb/ut/CMakeLists.txt b/ydb/services/ydb/ut/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/ydb/ut/CMakeLists.txt
+++ b/ydb/services/ydb/ut/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/yq/CMakeLists.darwin.txt b/ydb/services/yq/CMakeLists.darwin-x86_64.txt
index c43b046e76..c43b046e76 100644
--- a/ydb/services/yq/CMakeLists.darwin.txt
+++ b/ydb/services/yq/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/yq/CMakeLists.linux.txt b/ydb/services/yq/CMakeLists.linux-x86_64.txt
index 1b28a9ba1b..1b28a9ba1b 100644
--- a/ydb/services/yq/CMakeLists.linux.txt
+++ b/ydb/services/yq/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/yq/CMakeLists.txt b/ydb/services/yq/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/yq/CMakeLists.txt
+++ b/ydb/services/yq/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/services/yq/ut_integration/CMakeLists.darwin.txt b/ydb/services/yq/ut_integration/CMakeLists.darwin-x86_64.txt
index 4c244ac321..4c244ac321 100644
--- a/ydb/services/yq/ut_integration/CMakeLists.darwin.txt
+++ b/ydb/services/yq/ut_integration/CMakeLists.darwin-x86_64.txt
diff --git a/ydb/services/yq/ut_integration/CMakeLists.linux.txt b/ydb/services/yq/ut_integration/CMakeLists.linux-x86_64.txt
index 0952ca6d29..0952ca6d29 100644
--- a/ydb/services/yq/ut_integration/CMakeLists.linux.txt
+++ b/ydb/services/yq/ut_integration/CMakeLists.linux-x86_64.txt
diff --git a/ydb/services/yq/ut_integration/CMakeLists.txt b/ydb/services/yq/ut_integration/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/ydb/services/yq/ut_integration/CMakeLists.txt
+++ b/ydb/services/yq/ut_integration/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-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.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()