Intermediate changes

4634 files changed, 3086 insertions, 3086 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin-x86_64.txt
index fa276972cd1..fa276972cd1 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin-x86_64.txt
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux-x86_64.txt
index fa276972cd1..fa276972cd1 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux-x86_64.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a211b6e8da..90f600d7c9a 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 9ab67fa9078..9ab67fa9078 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 5b25b1d3c26..5b25b1d3c26 100644
--- a/certs/CMakeLists.linux.txt
+++ b/certs/CMakeLists.linux-x86_64.txt
diff --git a/certs/CMakeLists.txt b/certs/CMakeLists.txt
index eee324bb607..8f8c04afe54 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 8f275017547..8f275017547 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 797ac4fd05b..797ac4fd05b 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 eee324bb607..8f8c04afe54 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 8818693c62b..8818693c62b 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 e8fba8e6367..e8fba8e6367 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 eee324bb607..8f8c04afe54 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 dba4c90c1f9..dba4c90c1f9 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 b638c396edd..b638c396edd 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 eee324bb607..8f8c04afe54 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 303febcc155..303febcc155 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 214360c135d..214360c135d 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 eee324bb607..8f8c04afe54 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 45e01d7a291..45e01d7a291 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 1a7d3d48e7c..1a7d3d48e7c 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 eee324bb607..8f8c04afe54 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 0330c951bee..0330c951bee 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 fc60527db38..fc60527db38 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 eee324bb607..8f8c04afe54 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 1b1705649a5..1b1705649a5 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 114aa69426b..114aa69426b 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 eee324bb607..8f8c04afe54 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 b2e29c7a011..b2e29c7a011 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 b528c1f5998..b528c1f5998 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 eee324bb607..8f8c04afe54 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 a7ec94e9d01..a7ec94e9d01 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 2b3ad9b62d4..2b3ad9b62d4 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 eee324bb607..8f8c04afe54 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 732c4dd3754..732c4dd3754 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 e4923670c8e..e4923670c8e 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 eee324bb607..8f8c04afe54 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 d06a76d91a2..d06a76d91a2 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 edca2dcad49..edca2dcad49 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 eee324bb607..8f8c04afe54 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 9ccfdf670c4..9ccfdf670c4 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 722ac9fd408..722ac9fd408 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 eee324bb607..8f8c04afe54 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 e1d78be6e02..e1d78be6e02 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 f019ec569f9..f019ec569f9 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 eee324bb607..8f8c04afe54 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 0acd28e7cdb..0acd28e7cdb 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 f40a7896b98..f40a7896b98 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 eee324bb607..8f8c04afe54 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 5d11acad56d..5d11acad56d 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 6283846aef3..6283846aef3 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 eee324bb607..8f8c04afe54 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 297dae75337..297dae75337 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 1fd39e41209..1fd39e41209 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 eee324bb607..8f8c04afe54 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 a4e9994f8ad..a4e9994f8ad 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 5d6f6aabc8a..5d6f6aabc8a 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 eee324bb607..8f8c04afe54 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 86cdc28b8f7..86cdc28b8f7 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 e6a5c8c8a5d..e6a5c8c8a5d 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 eee324bb607..8f8c04afe54 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 0f492532e9d..0f492532e9d 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 24b6c4fac2f..24b6c4fac2f 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 eee324bb607..8f8c04afe54 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 7a5fb608355..7a5fb608355 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 5609bd43b30..5609bd43b30 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 eee324bb607..8f8c04afe54 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 231e81c8eee..231e81c8eee 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 ea5f7a2498b..ea5f7a2498b 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 eee324bb607..8f8c04afe54 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 dfe59125b53..dfe59125b53 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 b4d38acc9dd..b4d38acc9dd 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 eee324bb607..8f8c04afe54 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 b1aef2a37a4..b1aef2a37a4 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 edaf849b79c..edaf849b79c 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 eee324bb607..8f8c04afe54 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 22f534fcdd5..22f534fcdd5 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 144c793693f..144c793693f 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 eee324bb607..8f8c04afe54 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 1a5dff57185..1a5dff57185 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 e6b6dbf847d..e6b6dbf847d 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 eee324bb607..8f8c04afe54 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 69a5bc6b49f..69a5bc6b49f 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 7599b38c4d9..7599b38c4d9 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 eee324bb607..8f8c04afe54 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 374256f11fb..374256f11fb 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 6962df9bdbb..6962df9bdbb 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 eee324bb607..8f8c04afe54 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 aeb7bb29c0e..aeb7bb29c0e 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 e4fa621f996..e4fa621f996 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 eee324bb607..8f8c04afe54 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 921c50874ea..921c50874ea 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 d39e6b6a78e..d39e6b6a78e 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 eee324bb607..8f8c04afe54 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 92f77b4d9a6..92f77b4d9a6 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 a9197f9c439..a9197f9c439 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 eee324bb607..8f8c04afe54 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 c73d04f960e..c73d04f960e 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 b0bb6a58601..b0bb6a58601 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 eee324bb607..8f8c04afe54 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 eab41c060a7..eab41c060a7 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 e6a67c5372d..e6a67c5372d 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 eee324bb607..8f8c04afe54 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 a9d78d75992..a9d78d75992 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 0bff6a51f6b..0bff6a51f6b 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 eee324bb607..8f8c04afe54 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 a88074fd9d9..a88074fd9d9 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 a98aba7303a..a98aba7303a 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 eee324bb607..8f8c04afe54 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 011ef6a6c86..011ef6a6c86 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 f8cfeeb41d8..f8cfeeb41d8 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 eee324bb607..8f8c04afe54 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 c075387f004..c075387f004 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 5d50080edc9..5d50080edc9 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 eee324bb607..8f8c04afe54 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 769add5f8b1..769add5f8b1 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 5df7d108675..5df7d108675 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 eee324bb607..8f8c04afe54 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 2978b68ec9e..2978b68ec9e 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 61de386d30b..61de386d30b 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 eee324bb607..8f8c04afe54 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 8cc336fdd1a..8cc336fdd1a 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 baa66b76fec..baa66b76fec 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 eee324bb607..8f8c04afe54 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 984a14ba7c6..984a14ba7c6 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 8cffe390288..8cffe390288 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 eee324bb607..8f8c04afe54 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 3877a3a7da6..3877a3a7da6 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 3877a3a7da6..3877a3a7da6 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 0f8cf0fb161..a603bef54ed 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 d98bd38fb80..d98bd38fb80 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 502e383f491..502e383f491 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 0f8cf0fb161..a603bef54ed 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 644e629a9cd..644e629a9cd 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 52b6a35b110..52b6a35b110 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 0f8cf0fb161..a603bef54ed 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 8576e86aab3..8576e86aab3 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 06e680fc7ee..06e680fc7ee 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 0f8cf0fb161..a603bef54ed 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 85764417b72..85764417b72 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 8bae6021022..8bae6021022 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 0f8cf0fb161..a603bef54ed 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 e11134a46a8..e11134a46a8 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 411a9453a3e..411a9453a3e 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 0f8cf0fb161..a603bef54ed 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 63b5a339891..63b5a339891 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 9bb42a05f96..9bb42a05f96 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 0f8cf0fb161..a603bef54ed 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 c3088fa842c..c3088fa842c 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 c1878d2ffcf..c1878d2ffcf 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 0f8cf0fb161..a603bef54ed 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 6e164c5f6a7..6e164c5f6a7 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 420ab30dd35..420ab30dd35 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 eee324bb607..8f8c04afe54 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 8e041153f28..8e041153f28 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 e06c0a57bd2..e06c0a57bd2 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 eee324bb607..8f8c04afe54 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 84e3c97df1d..84e3c97df1d 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 26b43ddf096..26b43ddf096 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 eee324bb607..8f8c04afe54 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 f5bcb4e6581..f5bcb4e6581 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 865cd53d18e..865cd53d18e 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 eee324bb607..8f8c04afe54 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 536ee46c8bb..536ee46c8bb 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 66727f3e3e8..66727f3e3e8 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 eee324bb607..8f8c04afe54 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 6b663371d0b..6b663371d0b 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 c718ec93e51..c718ec93e51 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 eee324bb607..8f8c04afe54 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 76257b1032e..76257b1032e 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 58dc1438819..58dc1438819 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 eee324bb607..8f8c04afe54 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 18fe1e7a8bb..18fe1e7a8bb 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 04bb8460edf..04bb8460edf 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 eee324bb607..8f8c04afe54 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 09f088478d2..09f088478d2 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 12cc167e6b6..12cc167e6b6 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 eee324bb607..8f8c04afe54 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 0cbd83fbf44..0cbd83fbf44 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 27fc1b32f58..27fc1b32f58 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 eee324bb607..8f8c04afe54 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 0dc91909d1b..0dc91909d1b 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 f1c72fcd211..f1c72fcd211 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 eee324bb607..8f8c04afe54 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 47aedfab8fa..47aedfab8fa 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 80a28161e0b..80a28161e0b 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 eee324bb607..8f8c04afe54 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 63d62ff3ed1..63d62ff3ed1 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 ba630c0cc43..4349073206f 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 d593318062c..d593318062c 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 b607fa620b1..b607fa620b1 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 eee324bb607..8f8c04afe54 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 550534bb102..550534bb102 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 ba630c0cc43..4349073206f 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 a8dd8f11c1e..a8dd8f11c1e 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 5d4a8823193..5d4a8823193 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 eee324bb607..8f8c04afe54 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 92603f7489a..92603f7489a 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 ba630c0cc43..4349073206f 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 953c61faacd..953c61faacd 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 21e1679e2d6..21e1679e2d6 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 eee324bb607..8f8c04afe54 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 7ea3024199a..7ea3024199a 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 468c652df5d..468c652df5d 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 eee324bb607..8f8c04afe54 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 2ba11227e11..2ba11227e11 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 753119c17f2..753119c17f2 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 eee324bb607..8f8c04afe54 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 36839293f43..36839293f43 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 558f82cd5d2..558f82cd5d2 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 eee324bb607..8f8c04afe54 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 96149cac1fd..96149cac1fd 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 a10c5f413a6..a10c5f413a6 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 eee324bb607..8f8c04afe54 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 39b2ea7c63f..39b2ea7c63f 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 88a0842ef99..88a0842ef99 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 eee324bb607..8f8c04afe54 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 60790bac2e3..60790bac2e3 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 7bab4525b28..7bab4525b28 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 eee324bb607..8f8c04afe54 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 99a4a604d61..99a4a604d61 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 421708b1eea..421708b1eea 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 eee324bb607..8f8c04afe54 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 bcefc411a02..bcefc411a02 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 8a9a46ad09e..8a9a46ad09e 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 eee324bb607..8f8c04afe54 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 8e35eefddb6..8e35eefddb6 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 ab68b24331a..ab68b24331a 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 eee324bb607..8f8c04afe54 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 27309bf40c1..27309bf40c1 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 356c3e6fed9..356c3e6fed9 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 eee324bb607..8f8c04afe54 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 4e4dec12dae..4e4dec12dae 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 a29c8b0bd72..a29c8b0bd72 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 eee324bb607..8f8c04afe54 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 2d339031612..2d339031612 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 8069320e816..8069320e816 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 eee324bb607..8f8c04afe54 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 2b5a8b0bd74..2b5a8b0bd74 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 99bb6435ef0..99bb6435ef0 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 eee324bb607..8f8c04afe54 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 333a23b759d..333a23b759d 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 0afe1e70f07..0afe1e70f07 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 eee324bb607..8f8c04afe54 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 499426d8b6e..499426d8b6e 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 e5b50385a40..e5b50385a40 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 eee324bb607..8f8c04afe54 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 39a3b7dec0f..39a3b7dec0f 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 dff4e05e8d7..dff4e05e8d7 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 eee324bb607..8f8c04afe54 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 8ce23b0d3bd..8ce23b0d3bd 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 91665dd594a..91665dd594a 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 eee324bb607..8f8c04afe54 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 8822271bb66..8822271bb66 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 0b5d23d06fb..0b5d23d06fb 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 eee324bb607..8f8c04afe54 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 5404346e22a..5404346e22a 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 e2731cdb216..e2731cdb216 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 eee324bb607..8f8c04afe54 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 99bf1810a22..99bf1810a22 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 ba630c0cc43..4349073206f 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 a55dda54ceb..a55dda54ceb 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 f79d0d9af0a..f79d0d9af0a 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 eee324bb607..8f8c04afe54 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 ff198fe772d..ff198fe772d 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 879a65a6cb4..879a65a6cb4 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 eee324bb607..8f8c04afe54 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 39523b06af8..39523b06af8 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 1ec678d8d5a..1ec678d8d5a 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 eee324bb607..8f8c04afe54 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 bea3fbc885b..bea3fbc885b 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 2fc3d6c7810..2fc3d6c7810 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 eee324bb607..8f8c04afe54 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 1b6e260057c..1b6e260057c 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 00082279885..00082279885 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 eee324bb607..8f8c04afe54 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 a873c2d122e..a873c2d122e 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 62a27d359de..62a27d359de 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 eee324bb607..8f8c04afe54 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 a2bee93bc46..a2bee93bc46 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 a6713624c13..a6713624c13 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 eee324bb607..8f8c04afe54 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 e947a4a7c41..e947a4a7c41 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 5385e415dda..5385e415dda 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 eee324bb607..8f8c04afe54 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 f1207f4b5d4..f1207f4b5d4 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 45fb57f72c4..45fb57f72c4 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 eee324bb607..8f8c04afe54 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 3e79d53db20..3e79d53db20 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 8dbd3c6d656..8dbd3c6d656 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 eee324bb607..8f8c04afe54 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 edd1e0fe350..edd1e0fe350 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 ab39010290b..ab39010290b 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 eee324bb607..8f8c04afe54 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 e00be62440f..e00be62440f 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 89974d62a5d..89974d62a5d 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 eee324bb607..8f8c04afe54 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 6f2ec53956d..6f2ec53956d 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 13e6f131676..13e6f131676 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 eee324bb607..8f8c04afe54 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 d8ccbcb7dc0..d8ccbcb7dc0 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 cf814ae9478..cf814ae9478 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 eee324bb607..8f8c04afe54 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 122aabfd9ca..122aabfd9ca 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 30cd4e60a5c..30cd4e60a5c 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 eee324bb607..8f8c04afe54 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 aaa8d6337da..aaa8d6337da 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 982a7323e16..982a7323e16 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 eee324bb607..8f8c04afe54 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 9aeb4c51407..9aeb4c51407 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 eecb1b3d5f8..eecb1b3d5f8 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 eee324bb607..8f8c04afe54 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 d38e0dc78bc..d38e0dc78bc 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 8f818b1bf04..8f818b1bf04 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 eee324bb607..8f8c04afe54 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 f8e6afeb960..f8e6afeb960 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 776f51f91d5..776f51f91d5 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 eee324bb607..8f8c04afe54 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 507d58e59b0..507d58e59b0 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 4914b7d4f33..4914b7d4f33 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 eee324bb607..8f8c04afe54 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 5ca07fe1bce..5ca07fe1bce 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 b1a4c8817ab..b1a4c8817ab 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 eee324bb607..8f8c04afe54 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 bdf90955259..bdf90955259 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 ee458414a08..ee458414a08 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 eee324bb607..8f8c04afe54 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 a703571757c..a703571757c 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 00fbb651b8d..00fbb651b8d 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 eee324bb607..8f8c04afe54 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 1d62defbb4b..1d62defbb4b 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 870556286d1..870556286d1 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 eee324bb607..8f8c04afe54 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 bf742c3572b..bf742c3572b 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 1c1b924cc4c..1c1b924cc4c 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 eee324bb607..8f8c04afe54 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 b69d2408d20..b69d2408d20 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 17250eafeca..17250eafeca 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 eee324bb607..8f8c04afe54 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 85fbc1b9a9b..85fbc1b9a9b 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 b8137e772b5..b8137e772b5 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 eee324bb607..8f8c04afe54 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 85ed4a4c6db..85ed4a4c6db 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 f9c59ee4c38..f9c59ee4c38 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 eee324bb607..8f8c04afe54 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 d45ba449fd6..d45ba449fd6 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 b0d24912359..b0d24912359 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 eee324bb607..8f8c04afe54 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 ef39d6fd6e4..ef39d6fd6e4 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 d8d6dc0ce5c..d8d6dc0ce5c 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 eee324bb607..8f8c04afe54 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 7ab180f92f1..7ab180f92f1 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 bb006dd12d1..bb006dd12d1 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 eee324bb607..8f8c04afe54 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 b8bb770b445..b8bb770b445 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 c9c201999bb..c9c201999bb 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 eee324bb607..8f8c04afe54 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 970c719b71c..970c719b71c 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 696aaa00565..696aaa00565 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 eee324bb607..8f8c04afe54 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 d525ab738b5..d525ab738b5 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 1be6e4f2c7c..1be6e4f2c7c 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 eee324bb607..8f8c04afe54 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 fa5ab87a58f..fa5ab87a58f 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 446f28a8ed4..446f28a8ed4 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 eee324bb607..8f8c04afe54 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 f51760c82e4..f51760c82e4 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 ff3e8d2dd3b..ff3e8d2dd3b 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 eee324bb607..8f8c04afe54 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 aa5e1ba2a75..aa5e1ba2a75 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 805840b5cdc..805840b5cdc 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 eee324bb607..8f8c04afe54 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 e6d5bc3ea13..e6d5bc3ea13 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 3224ad6131a..3224ad6131a 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 eee324bb607..8f8c04afe54 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 d217f5c0b34..d217f5c0b34 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 3051404f466..3051404f466 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 eee324bb607..8f8c04afe54 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 5f646dba67e..5f646dba67e 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 22abfadba3d..22abfadba3d 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 eee324bb607..8f8c04afe54 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 2be6098116b..2be6098116b 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 f8269b28594..f8269b28594 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 eee324bb607..8f8c04afe54 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 7041694f052..7041694f052 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 9824fa00174..9824fa00174 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 eee324bb607..8f8c04afe54 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 431de24a137..431de24a137 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 0638e0d2191..0638e0d2191 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 eee324bb607..8f8c04afe54 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 8b1e0a65b50..8b1e0a65b50 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 781a72b8115..781a72b8115 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 eee324bb607..8f8c04afe54 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 403b3bc5c6e..403b3bc5c6e 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 03b67f2fd7d..03b67f2fd7d 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 eee324bb607..8f8c04afe54 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 4dd5878c21b..4dd5878c21b 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 cf62029e714..cf62029e714 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 eee324bb607..8f8c04afe54 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 4d7e2f17c07..4d7e2f17c07 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 7eab9ec5126..7eab9ec5126 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 eee324bb607..8f8c04afe54 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 813912d18d9..813912d18d9 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 56c49ac4c63..56c49ac4c63 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 eee324bb607..8f8c04afe54 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 5e02faf42f5..5e02faf42f5 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 803edf0122e..803edf0122e 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 eee324bb607..8f8c04afe54 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 940e5e3a990..940e5e3a990 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 af2c6d84045..af2c6d84045 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 eee324bb607..8f8c04afe54 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 4cce10e7b9d..4cce10e7b9d 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 b6a3dcc4bcb..b6a3dcc4bcb 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 eee324bb607..8f8c04afe54 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 eb8dce44f8b..eb8dce44f8b 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 a6f2faf4789..a6f2faf4789 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 eee324bb607..8f8c04afe54 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 0c93126cd11..0c93126cd11 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 ed757c6e177..ed757c6e177 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 eee324bb607..8f8c04afe54 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 5e20f5ea3de..5e20f5ea3de 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 732c5e5474b..732c5e5474b 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 eee324bb607..8f8c04afe54 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 0de0e50d71c..0de0e50d71c 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 ddcaf918dc5..ddcaf918dc5 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 eee324bb607..8f8c04afe54 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 cf6ef995113..cf6ef995113 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 7f2893caa34..7f2893caa34 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 eee324bb607..8f8c04afe54 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 a34e19b4a06..a34e19b4a06 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 4e7404a3daf..4e7404a3daf 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 eee324bb607..8f8c04afe54 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 daf0950e7c4..daf0950e7c4 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 53fb70fafae..53fb70fafae 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 eee324bb607..8f8c04afe54 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 ff72551b971..ff72551b971 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 4fc12f623da..4fc12f623da 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 eee324bb607..8f8c04afe54 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 7a19810cbad..7a19810cbad 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 200be30d208..9e182254dbc 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 da6056a44b7..da6056a44b7 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 321e8eac3f0..321e8eac3f0 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 eee324bb607..8f8c04afe54 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 2afaa79b4e1..2afaa79b4e1 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 0bc17080e12..0bc17080e12 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 eee324bb607..8f8c04afe54 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 e5b20eefab6..e5b20eefab6 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 4daaa9883ad..4daaa9883ad 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 eee324bb607..8f8c04afe54 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 f88c0aa5f39..f88c0aa5f39 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 1945bc36fe5..1945bc36fe5 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 eee324bb607..8f8c04afe54 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 b20e4ae1f5c..b20e4ae1f5c 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 2934739ddc4..2934739ddc4 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 eee324bb607..8f8c04afe54 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 a85dbb45d3f..a85dbb45d3f 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 a51d5c88800..a51d5c88800 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 eee324bb607..8f8c04afe54 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 76a58108176..76a58108176 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 22f298cf7d9..22f298cf7d9 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 eee324bb607..8f8c04afe54 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 3efe12ff583..3efe12ff583 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 55ca1c759ba..55ca1c759ba 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 eee324bb607..8f8c04afe54 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 65d79f1a81c..65d79f1a81c 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 adde78aabeb..adde78aabeb 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 eee324bb607..8f8c04afe54 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 a1f6d47793b..a1f6d47793b 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 e7af2024c13..e7af2024c13 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 eee324bb607..8f8c04afe54 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 0650809a3b2..0650809a3b2 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 f55013927e8..f55013927e8 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 eee324bb607..8f8c04afe54 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 8bb73fa5320..8bb73fa5320 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 a632a01f094..a632a01f094 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 eee324bb607..8f8c04afe54 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 1fa7e9da7fd..1fa7e9da7fd 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 bb6a283f3bb..bb6a283f3bb 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 eee324bb607..8f8c04afe54 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 f98e8828e79..f98e8828e79 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 451fce6d4ab..451fce6d4ab 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 eee324bb607..8f8c04afe54 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 ec53f57bc15..ec53f57bc15 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 a1ceaf2b75e..a1ceaf2b75e 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 eee324bb607..8f8c04afe54 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 068982719c7..068982719c7 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 737ba55d854..737ba55d854 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 eee324bb607..8f8c04afe54 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 564e9bb142e..564e9bb142e 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 51892581b3a..51892581b3a 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 eee324bb607..8f8c04afe54 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 18d72c66855..18d72c66855 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 43faced540f..43faced540f 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 eee324bb607..8f8c04afe54 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 7901d8cf245..7901d8cf245 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 f2e0472a5d4..f2e0472a5d4 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 eee324bb607..8f8c04afe54 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 e46d70dd3ed..e46d70dd3ed 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 3837b423962..3837b423962 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 eee324bb607..8f8c04afe54 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 dc048c9436f..dc048c9436f 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 cdf38f454c5..cdf38f454c5 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 eee324bb607..8f8c04afe54 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 a5ff3f433a7..a5ff3f433a7 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 653bb04f7ab..653bb04f7ab 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 eee324bb607..8f8c04afe54 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 74ef613f089..74ef613f089 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 07f9f59ee4f..07f9f59ee4f 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 eee324bb607..8f8c04afe54 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 535abc7c56e..535abc7c56e 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 e29a80e43d4..e29a80e43d4 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 eee324bb607..8f8c04afe54 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 1c3e1d4debd..1c3e1d4debd 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 89d5fdbf42e..89d5fdbf42e 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 eee324bb607..8f8c04afe54 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 3be1fa16926..3be1fa16926 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 bf4cf39aa90..bf4cf39aa90 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 eee324bb607..8f8c04afe54 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 3c60c7b056c..3c60c7b056c 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 89a07a760b4..89a07a760b4 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 eee324bb607..8f8c04afe54 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 51a0971139a..51a0971139a 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 a61094881a3..a61094881a3 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 eee324bb607..8f8c04afe54 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 e73fa82ef76..e73fa82ef76 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 fb49dbcfee9..fb49dbcfee9 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 eee324bb607..8f8c04afe54 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 bb7bb34def6..bb7bb34def6 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 54f9fbec1cb..54f9fbec1cb 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 eee324bb607..8f8c04afe54 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 c2793a97eaa..c2793a97eaa 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 a7743e41a05..a7743e41a05 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 eee324bb607..8f8c04afe54 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 3235ac4ba50..3235ac4ba50 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 e87b112e2fb..e87b112e2fb 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 eee324bb607..8f8c04afe54 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 cba7d556115..cba7d556115 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 1bb7f8ea3ed..1bb7f8ea3ed 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 eee324bb607..8f8c04afe54 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 82fe8b2770c..82fe8b2770c 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 a6593d4b95d..a6593d4b95d 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 eee324bb607..8f8c04afe54 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 15c4b76f676..15c4b76f676 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 876a1ced58a..876a1ced58a 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 eee324bb607..8f8c04afe54 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 324203b94a1..324203b94a1 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 b630e36b397..b630e36b397 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 eee324bb607..8f8c04afe54 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 82c6e43c911..82c6e43c911 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 ef805d8dde2..ef805d8dde2 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 eee324bb607..8f8c04afe54 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 e3aa400b959..e3aa400b959 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 2da01ab774e..2da01ab774e 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 eee324bb607..8f8c04afe54 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 16ea7b2596b..16ea7b2596b 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 358da661fc6..358da661fc6 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 eee324bb607..8f8c04afe54 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 af147aa1715..af147aa1715 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 e934d9a1f32..e934d9a1f32 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 eee324bb607..8f8c04afe54 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 9c24497045c..9c24497045c 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 cbc8bf8b2e2..cbc8bf8b2e2 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 eee324bb607..8f8c04afe54 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 a2f021177aa..a2f021177aa 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 9f8f6c068d6..9f8f6c068d6 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 eee324bb607..8f8c04afe54 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 c28381a676a..c28381a676a 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 d729ec396a2..d729ec396a2 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 eee324bb607..8f8c04afe54 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 c6d3f58fef0..c6d3f58fef0 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 2e36a7692bc..2e36a7692bc 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 eee324bb607..8f8c04afe54 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 d7f9cd17a6f..d7f9cd17a6f 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 e754eefb5a2..e754eefb5a2 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 eee324bb607..8f8c04afe54 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 64d2a9dee33..64d2a9dee33 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 859d5769a17..859d5769a17 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 eee324bb607..8f8c04afe54 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 c7805ff1e28..c7805ff1e28 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 70c75162acf..70c75162acf 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 eee324bb607..8f8c04afe54 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 976996467f9..976996467f9 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 e4b895391ca..e4b895391ca 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 eee324bb607..8f8c04afe54 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 2ce12f636b3..2ce12f636b3 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 2ce12f636b3..2ce12f636b3 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 eee324bb607..8f8c04afe54 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 7601e49d0f9..7601e49d0f9 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 ded7dbfbd84..ded7dbfbd84 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 eee324bb607..8f8c04afe54 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 b4f255a0c6e..b4f255a0c6e 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 e032aaa404e..e032aaa404e 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 eee324bb607..8f8c04afe54 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 946a109665e..946a109665e 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 b1d48450502..b1d48450502 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 eee324bb607..8f8c04afe54 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 f640cbf516c..f640cbf516c 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 157f171696e..157f171696e 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 eee324bb607..8f8c04afe54 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 74b17e3e1bd..74b17e3e1bd 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 0108378f15f..0108378f15f 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 eee324bb607..8f8c04afe54 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 0ba173db4f8..0ba173db4f8 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 bd55d5ef619..bd55d5ef619 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 eee324bb607..8f8c04afe54 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 c7c24c5a0f0..c7c24c5a0f0 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 5f830a8cfa8..5f830a8cfa8 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 eee324bb607..8f8c04afe54 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 c44e09b7d6f..c44e09b7d6f 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 ec170e9cbc8..ec170e9cbc8 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 0f8cf0fb161..a603bef54ed 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 88c5f9bf7b9..88c5f9bf7b9 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 d77d1b474b9..d77d1b474b9 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 eee324bb607..8f8c04afe54 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 af74091cab5..af74091cab5 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 849cd7c2154..849cd7c2154 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 eee324bb607..8f8c04afe54 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 4bea4830c41..4bea4830c41 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 e2b6d7b8684..e2b6d7b8684 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 eee324bb607..8f8c04afe54 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 b3623a130d7..b3623a130d7 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 5bebf20e986..5bebf20e986 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 eee324bb607..8f8c04afe54 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 74ef11ce7c5..74ef11ce7c5 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 8478a2b4757..8478a2b4757 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 eee324bb607..8f8c04afe54 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 f6ba33a6e96..f6ba33a6e96 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 0e9a7fc3901..0e9a7fc3901 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 eee324bb607..8f8c04afe54 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 d5301afd155..d5301afd155 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 21ce313ed96..21ce313ed96 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 eee324bb607..8f8c04afe54 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 100cd01a5d6..100cd01a5d6 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 06f9049883d..06f9049883d 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 eee324bb607..8f8c04afe54 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 f1a53fd123f..f1a53fd123f 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 ccc6337d05c..ccc6337d05c 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 eee324bb607..8f8c04afe54 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 8b4b0f15dad..8b4b0f15dad 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 9a1bc627069..9a1bc627069 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 eee324bb607..8f8c04afe54 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 078b319b347..078b319b347 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 d91726a632b..d91726a632b 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 eee324bb607..8f8c04afe54 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 2730ce7c010..2730ce7c010 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 6473832eb12..6473832eb12 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 eee324bb607..8f8c04afe54 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 da90148a57a..da90148a57a 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 94835f076ab..94835f076ab 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 eee324bb607..8f8c04afe54 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 baad9670e4b..baad9670e4b 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 4cffd37833f..4cffd37833f 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 eee324bb607..8f8c04afe54 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 4100f97935c..4100f97935c 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 a57ff442744..a57ff442744 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 eee324bb607..8f8c04afe54 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 8854d288e8e..8854d288e8e 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 1a02ca21502..1a02ca21502 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 eee324bb607..8f8c04afe54 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 ddf28f75fe4..ddf28f75fe4 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 8a7f037fd78..8a7f037fd78 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 eee324bb607..8f8c04afe54 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 bd4347f03d4..bd4347f03d4 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 b818e6d085c..b818e6d085c 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 eee324bb607..8f8c04afe54 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 d2e31c32fc8..d2e31c32fc8 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 f1173b51a9d..f1173b51a9d 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 eee324bb607..8f8c04afe54 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 270e92cb48f..270e92cb48f 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 d19c8b9a869..d19c8b9a869 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 eee324bb607..8f8c04afe54 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 5eed0832c43..5eed0832c43 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 a963bc1c023..a963bc1c023 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 eee324bb607..8f8c04afe54 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 2c618a189f3..2c618a189f3 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 e128b6adffc..e128b6adffc 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 eee324bb607..8f8c04afe54 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 239823acab2..239823acab2 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 baa561be6c3..baa561be6c3 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 eee324bb607..8f8c04afe54 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 a26f5b12a3e..a26f5b12a3e 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 6540394cad6..6540394cad6 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 eee324bb607..8f8c04afe54 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 9118ce39b67..9118ce39b67 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 fd2c3cf33bc..fd2c3cf33bc 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 0f8cf0fb161..a603bef54ed 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 b6b11aeab90..b6b11aeab90 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 9f4aa50c8fb..9f4aa50c8fb 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 0f8cf0fb161..a603bef54ed 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 b8189c5a7a9..b8189c5a7a9 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 6fad3b6c9ed..6fad3b6c9ed 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 eee324bb607..8f8c04afe54 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 f95f9fc6c9f..f95f9fc6c9f 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 75abc5bc492..75abc5bc492 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 eee324bb607..8f8c04afe54 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 261b65dc857..261b65dc857 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 0f15706c633..0f15706c633 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 eee324bb607..8f8c04afe54 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 4aeba3ef014..4aeba3ef014 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 c7e646dfef9..c7e646dfef9 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 eee324bb607..8f8c04afe54 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 ecd5b2a38d1..ecd5b2a38d1 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 1d1e246daee..1d1e246daee 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 eee324bb607..8f8c04afe54 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 df59b473b28..df59b473b28 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 a1ebd81a38f..a1ebd81a38f 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 eee324bb607..8f8c04afe54 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 f3556a1958e..f3556a1958e 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 ba6f725eadb..ba6f725eadb 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 0f8cf0fb161..a603bef54ed 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 c4aff4db0d5..c4aff4db0d5 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 d746f22befe..d746f22befe 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 eee324bb607..8f8c04afe54 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 8e8b149e509..8e8b149e509 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 831330fafc3..831330fafc3 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 eee324bb607..8f8c04afe54 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 71d5facb39e..71d5facb39e 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 b8ed0bead8b..b8ed0bead8b 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 eee324bb607..8f8c04afe54 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 37a8b34d946..37a8b34d946 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 d2a4daa0759..d2a4daa0759 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 eee324bb607..8f8c04afe54 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 7100a8f570d..7100a8f570d 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 88c153c72c1..88c153c72c1 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 eee324bb607..8f8c04afe54 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 8b161d3adfd..8b161d3adfd 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 2a2813d50c8..2a2813d50c8 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 eee324bb607..8f8c04afe54 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 0f36dd5b204..0f36dd5b204 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 a9bf7bfcb38..a9bf7bfcb38 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 0f8cf0fb161..a603bef54ed 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 e8f6c61e6e3..e8f6c61e6e3 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 fb769ceb012..fb769ceb012 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 eee324bb607..8f8c04afe54 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 c4797132e9e..c4797132e9e 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 46d33c5f9d4..46d33c5f9d4 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 eee324bb607..8f8c04afe54 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 b94f64d5c46..b94f64d5c46 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 0bf5a6292df..0bf5a6292df 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 eee324bb607..8f8c04afe54 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 7aad7283416..7aad7283416 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 d5bb0e8b6e2..d5bb0e8b6e2 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 0f8cf0fb161..a603bef54ed 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 7bf8181aa5e..7bf8181aa5e 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 80062339a36..80062339a36 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 eee324bb607..8f8c04afe54 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 a0e50e5cde2..a0e50e5cde2 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 a5d127cffbf..a5d127cffbf 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 eee324bb607..8f8c04afe54 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 c55eab9d0f6..c55eab9d0f6 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 a0087e3f0db..a0087e3f0db 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 eee324bb607..8f8c04afe54 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 7df51769d9a..7df51769d9a 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 e6e835b5adf..e6e835b5adf 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 eee324bb607..8f8c04afe54 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 c91dfc15c59..c91dfc15c59 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 1bd268a977a..1bd268a977a 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 eee324bb607..8f8c04afe54 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 d49456c891b..d49456c891b 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 cfb3bee9458..cfb3bee9458 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 0f8cf0fb161..a603bef54ed 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 57f107d22d6..57f107d22d6 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 b64b977a645..b64b977a645 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 0f8cf0fb161..a603bef54ed 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 370165e4fff..370165e4fff 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 8fa3b296b20..8fa3b296b20 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 eee324bb607..8f8c04afe54 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 647aa946684..647aa946684 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 23ae6c61529..23ae6c61529 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 eee324bb607..8f8c04afe54 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 eadd2f290c7..eadd2f290c7 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 a97889d7f60..a97889d7f60 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 eee324bb607..8f8c04afe54 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 7171c49b081..7171c49b081 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 90cac9ef7a9..90cac9ef7a9 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 eee324bb607..8f8c04afe54 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 c4d92a21a6e..c4d92a21a6e 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 61fd5149ab3..61fd5149ab3 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 eee324bb607..8f8c04afe54 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 b0c67b4c889..b0c67b4c889 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 554805be78e..554805be78e 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 eee324bb607..8f8c04afe54 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 52603eb79dc..52603eb79dc 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 43d01c0ab03..43d01c0ab03 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 eee324bb607..8f8c04afe54 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 e13c2385804..e13c2385804 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 1c30f857e3c..1c30f857e3c 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 eee324bb607..8f8c04afe54 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 6a804f549db..6a804f549db 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 01948379bbf..01948379bbf 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 eee324bb607..8f8c04afe54 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 6506f1babd0..6506f1babd0 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 efc171911e7..efc171911e7 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 eee324bb607..8f8c04afe54 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 49847620cb9..49847620cb9 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 bb535c43334..bb535c43334 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 eee324bb607..8f8c04afe54 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 683da254264..683da254264 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 ee0e2e1fcc5..ee0e2e1fcc5 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 eee324bb607..8f8c04afe54 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 eefa32cee28..eefa32cee28 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 105ee3325e7..105ee3325e7 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 eee324bb607..8f8c04afe54 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 484614506f2..484614506f2 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 f150b16ca27..f150b16ca27 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 eee324bb607..8f8c04afe54 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 21cde2d8ba6..21cde2d8ba6 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 9c8dd5bc54b..9c8dd5bc54b 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 0f8cf0fb161..a603bef54ed 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 35051c1252b..35051c1252b 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 de83f3637ab..de83f3637ab 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 eee324bb607..8f8c04afe54 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 e6366d2523e..e6366d2523e 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 333b4a45fd8..333b4a45fd8 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 eee324bb607..8f8c04afe54 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 a32d4a750ef..a32d4a750ef 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 9771ff8a740..9771ff8a740 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 eee324bb607..8f8c04afe54 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 04fff27108b..04fff27108b 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 ff3ee3a2660..ff3ee3a2660 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 eee324bb607..8f8c04afe54 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 0a1dbba096f..0a1dbba096f 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 2c662b87034..2c662b87034 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 eee324bb607..8f8c04afe54 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 75fd8785291..75fd8785291 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 a04da10363c..a04da10363c 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 eee324bb607..8f8c04afe54 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 609c9606b81..609c9606b81 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 051a57fd901..051a57fd901 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 eee324bb607..8f8c04afe54 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 faec5d90979..faec5d90979 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 b3cdd31e101..b3cdd31e101 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 eee324bb607..8f8c04afe54 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 13fd04341f2..13fd04341f2 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 08c08093611..08c08093611 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 eee324bb607..8f8c04afe54 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 d8974003403..d8974003403 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 ad594157635..ad594157635 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 0f8cf0fb161..a603bef54ed 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 d7518da2f45..d7518da2f45 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 1abb1abf0a6..1abb1abf0a6 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 eee324bb607..8f8c04afe54 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 4e0fcd5b990..4e0fcd5b990 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 83a5cfb37c5..83a5cfb37c5 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 eee324bb607..8f8c04afe54 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 277929ec2e3..277929ec2e3 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 4541d2ed55b..4541d2ed55b 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 eee324bb607..8f8c04afe54 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 01df6b6ce7a..01df6b6ce7a 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 d500700c458..d500700c458 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 eee324bb607..8f8c04afe54 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 b28f00772fd..b28f00772fd 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 b04078314ec..b04078314ec 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 eee324bb607..8f8c04afe54 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 0c96110bcc4..0c96110bcc4 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 2641b31de22..2641b31de22 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 eee324bb607..8f8c04afe54 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 fcff6a7639b..fcff6a7639b 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 daee3f2fa47..daee3f2fa47 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 eee324bb607..8f8c04afe54 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 2163bfff7cb..2163bfff7cb 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 ef48e97a88d..ef48e97a88d 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 eee324bb607..8f8c04afe54 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 c1676eedb9d..c1676eedb9d 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 1a479939c52..1a479939c52 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 eee324bb607..8f8c04afe54 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 6839a38ee97..6839a38ee97 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 132a3329781..132a3329781 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 eee324bb607..8f8c04afe54 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 146ef843d10..146ef843d10 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 642f45d4fd0..642f45d4fd0 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 eee324bb607..8f8c04afe54 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 2e5648a15c1..2e5648a15c1 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 2e5648a15c1..2e5648a15c1 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 eee324bb607..8f8c04afe54 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 6d68faefed9..6d68faefed9 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 d168ea5295a..d168ea5295a 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 eee324bb607..8f8c04afe54 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 7fe4e2c2ff7..7fe4e2c2ff7 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 e2a6cc1f08c..e2a6cc1f08c 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 eee324bb607..8f8c04afe54 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 539f17a1a2f..539f17a1a2f 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 03a286a6630..03a286a6630 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 eee324bb607..8f8c04afe54 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 341f9e7593d..341f9e7593d 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 202d9028bcf..202d9028bcf 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 eee324bb607..8f8c04afe54 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 16ecfc7b98c..16ecfc7b98c 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 b00db82fdec..b00db82fdec 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 eee324bb607..8f8c04afe54 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 c60599beaa4..c60599beaa4 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 d6e3868652a..d6e3868652a 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 eee324bb607..8f8c04afe54 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 49ad9e634be..49ad9e634be 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 255f935cda3..255f935cda3 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 eee324bb607..8f8c04afe54 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 c29d87b0ce3..c29d87b0ce3 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 85d0cf46964..85d0cf46964 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 eee324bb607..8f8c04afe54 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 2845e78e353..2845e78e353 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 15786d6c742..15786d6c742 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 eee324bb607..8f8c04afe54 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 5109f0fcce9..5109f0fcce9 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 1fa79db3fff..1fa79db3fff 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 eee324bb607..8f8c04afe54 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 9ee960950de..9ee960950de 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 a7ee6c9586f..a7ee6c9586f 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 eee324bb607..8f8c04afe54 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 be3257b1276..be3257b1276 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 a9da706400f..a9da706400f 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 eee324bb607..8f8c04afe54 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 1508c82e9bc..1508c82e9bc 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 68cb3d3199f..68cb3d3199f 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 eee324bb607..8f8c04afe54 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 2bac6f5b8a8..2bac6f5b8a8 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 9eebd23475b..9eebd23475b 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 eee324bb607..8f8c04afe54 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 45704ccd5a2..45704ccd5a2 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 ccc87489aeb..ccc87489aeb 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 eee324bb607..8f8c04afe54 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 5e21c8ffc3b..5e21c8ffc3b 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 d12c55767a5..d12c55767a5 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 eee324bb607..8f8c04afe54 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 37c28ba02a3..37c28ba02a3 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 03631029ddf..03631029ddf 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 eee324bb607..8f8c04afe54 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 08814068d19..08814068d19 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 8b703ab6d46..8b703ab6d46 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 eee324bb607..8f8c04afe54 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 04448766819..04448766819 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 78dd3d4b903..78dd3d4b903 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 eee324bb607..8f8c04afe54 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 37f588f7f71..37f588f7f71 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 aa604e5d20c..aa604e5d20c 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 eee324bb607..8f8c04afe54 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 3430226be1f..3430226be1f 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 1a5048d32f5..1a5048d32f5 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 eee324bb607..8f8c04afe54 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 3e27b7a8423..3e27b7a8423 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 35dab036edc..35dab036edc 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 eee324bb607..8f8c04afe54 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 3b5f212510a..3b5f212510a 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 4b750271970..4b750271970 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 eee324bb607..8f8c04afe54 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 0af596c5de6..0af596c5de6 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 ccb11a52888..ccb11a52888 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 eee324bb607..8f8c04afe54 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 fd7180543ce..fd7180543ce 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 cb9bd53db14..cb9bd53db14 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 eee324bb607..8f8c04afe54 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 0acda91a4dc..0acda91a4dc 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 841e41dc333..841e41dc333 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 eee324bb607..8f8c04afe54 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 c6d20bf8fc5..c6d20bf8fc5 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 e0dbc8de82b..e0dbc8de82b 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 eee324bb607..8f8c04afe54 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 92e6f5f9db6..92e6f5f9db6 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 0d4874b329a..0d4874b329a 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 eee324bb607..8f8c04afe54 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 acaf2f9e8d6..acaf2f9e8d6 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 0fee0bb18df..0fee0bb18df 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 eee324bb607..8f8c04afe54 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 995fd58dfce..995fd58dfce 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 de6eef3de03..de6eef3de03 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 eee324bb607..8f8c04afe54 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 2e13dbce8c2..2e13dbce8c2 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 22fe89535f8..22fe89535f8 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 eee324bb607..8f8c04afe54 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 894ad9b9a8b..894ad9b9a8b 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 46c472e81f8..46c472e81f8 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 eee324bb607..8f8c04afe54 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 c49c7d01b8f..c49c7d01b8f 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 407f8f62e12..407f8f62e12 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 eee324bb607..8f8c04afe54 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 64ef18e5d9f..64ef18e5d9f 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 249edbf20a3..249edbf20a3 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 eee324bb607..8f8c04afe54 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 a749cac8a03..a749cac8a03 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 7067bdf107c..7067bdf107c 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 eee324bb607..8f8c04afe54 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 82cae52ee21..82cae52ee21 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 4278ad1c770..4278ad1c770 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 eee324bb607..8f8c04afe54 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 d6d3602e2d2..d6d3602e2d2 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 d02118b8f77..d02118b8f77 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 eee324bb607..8f8c04afe54 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 186d00a9389..186d00a9389 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 eec57f881a2..eec57f881a2 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 eee324bb607..8f8c04afe54 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 2be179087cf..2be179087cf 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 b2e97648f9b..b2e97648f9b 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 eee324bb607..8f8c04afe54 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 2bc3133ce1c..2bc3133ce1c 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 e70090edcb2..e70090edcb2 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 eee324bb607..8f8c04afe54 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 7f06cf83d8a..7f06cf83d8a 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 734416a5272..734416a5272 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 eee324bb607..8f8c04afe54 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 a47c86d7eaa..a47c86d7eaa 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 d407d96e14e..d407d96e14e 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 eee324bb607..8f8c04afe54 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 abcc95d486f..abcc95d486f 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 f7c1ee7be78..f7c1ee7be78 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 eee324bb607..8f8c04afe54 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 e695ca6521a..e695ca6521a 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 d438e07d935..d438e07d935 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 eee324bb607..8f8c04afe54 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 23c772e4fc2..23c772e4fc2 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 3e91ece220b..3e91ece220b 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 eee324bb607..8f8c04afe54 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 c1371c0defe..c1371c0defe 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 25140f3dc92..25140f3dc92 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 eee324bb607..8f8c04afe54 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 4ab79d02db6..4ab79d02db6 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 379fc48361c..379fc48361c 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 eee324bb607..8f8c04afe54 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 d0486e1c368..d0486e1c368 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 2db431da3fc..2db431da3fc 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 eee324bb607..8f8c04afe54 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 97b139a7fac..97b139a7fac 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 758be4fd4c0..758be4fd4c0 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 eee324bb607..8f8c04afe54 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 57d3af0a1be..57d3af0a1be 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 a2171479e99..a2171479e99 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 eee324bb607..8f8c04afe54 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 3a3d86aed70..3a3d86aed70 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 599cc37088e..599cc37088e 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 eee324bb607..8f8c04afe54 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 1fd4597d59a..1fd4597d59a 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 c62ad5f23cd..c62ad5f23cd 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 eee324bb607..8f8c04afe54 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 17eb5a21b78..17eb5a21b78 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 d5ab2865c77..d5ab2865c77 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 eee324bb607..8f8c04afe54 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 651df561c1d..651df561c1d 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 b558f155bc7..b558f155bc7 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 eee324bb607..8f8c04afe54 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 45d7acb8388..45d7acb8388 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 82927607d1c..82927607d1c 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 eee324bb607..8f8c04afe54 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 c44af664bcc..c44af664bcc 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 b1f740cc454..b1f740cc454 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 eee324bb607..8f8c04afe54 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 490e1427d4c..490e1427d4c 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 59e7ab09286..59e7ab09286 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 eee324bb607..8f8c04afe54 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 e1438df9747..e1438df9747 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 8af3de1300f..8af3de1300f 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 eee324bb607..8f8c04afe54 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 83fde56a05a..83fde56a05a 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 1d3d430a320..1d3d430a320 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 eee324bb607..8f8c04afe54 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 2950b6b535c..2950b6b535c 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 c4bb46961ff..c4bb46961ff 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 eee324bb607..8f8c04afe54 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 ee42c250c61..ee42c250c61 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 e78f115ba1c..e78f115ba1c 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 eee324bb607..8f8c04afe54 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 cc2996b5112..cc2996b5112 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 0549b8da46d..0549b8da46d 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 eee324bb607..8f8c04afe54 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 d709a1e9433..d709a1e9433 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 b2912afd4c8..b2912afd4c8 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 eee324bb607..8f8c04afe54 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 125cb4b2ed9..125cb4b2ed9 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 6e1b4b95d15..6e1b4b95d15 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 eee324bb607..8f8c04afe54 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 73f1df8e6f7..73f1df8e6f7 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 1e9530b77d9..1e9530b77d9 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 eee324bb607..8f8c04afe54 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 78664f1ffe3..78664f1ffe3 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 a45f22e5e32..a45f22e5e32 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 0f8cf0fb161..a603bef54ed 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 6e29430ec2e..6e29430ec2e 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 1e819ca7239..1e819ca7239 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 eee324bb607..8f8c04afe54 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 62226eb5590..62226eb5590 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 0d8a3a9ed2c..0d8a3a9ed2c 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 eee324bb607..8f8c04afe54 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 411024be151..411024be151 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 29db7b690f3..29db7b690f3 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 eee324bb607..8f8c04afe54 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 3ec6a99b97c..3ec6a99b97c 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 255bbbe4537..255bbbe4537 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 eee324bb607..8f8c04afe54 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 1a8b825dad6..1a8b825dad6 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 ed7a436e3c9..ed7a436e3c9 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 eee324bb607..8f8c04afe54 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 d23b1620f78..d23b1620f78 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 4851ba6aba6..4851ba6aba6 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 eee324bb607..8f8c04afe54 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 f6c4677907d..f6c4677907d 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 47ba972f0fb..47ba972f0fb 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 eee324bb607..8f8c04afe54 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 7b132051dad..7b132051dad 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 2eafc5fe69d..2eafc5fe69d 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 eee324bb607..8f8c04afe54 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 e2dbc9ace90..e2dbc9ace90 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 b0bc4fd1cd8..b0bc4fd1cd8 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 eee324bb607..8f8c04afe54 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 63474af49f6..63474af49f6 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 390ba105482..390ba105482 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 eee324bb607..8f8c04afe54 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 7e8d1fcb36b..7e8d1fcb36b 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 f6df186ad25..f6df186ad25 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 eee324bb607..8f8c04afe54 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 e34d1b90656..e34d1b90656 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 e34d1b90656..e34d1b90656 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 eee324bb607..8f8c04afe54 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 6242e299b8f..6242e299b8f 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 1f954bb636d..1f954bb636d 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 0f8cf0fb161..a603bef54ed 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 bb153d887af..bb153d887af 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 a5caf518c96..a5caf518c96 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 eee324bb607..8f8c04afe54 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 f4ed53513cc..f4ed53513cc 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 0f6d317b77a..0f6d317b77a 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 eee324bb607..8f8c04afe54 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 7b57a5e09b2..7b57a5e09b2 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 3c12d161173..3c12d161173 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 0f8cf0fb161..a603bef54ed 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 48f772826d3..48f772826d3 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 602f000ee5a..602f000ee5a 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 0f8cf0fb161..a603bef54ed 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 8c1d2591ed7..8c1d2591ed7 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 b70cc4d942d..b70cc4d942d 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 0f8cf0fb161..a603bef54ed 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 b4468ed3514..b4468ed3514 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 1ef3f3119d7..1ef3f3119d7 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 eee324bb607..8f8c04afe54 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 295652eae02..295652eae02 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 8d93b2e2897..8d93b2e2897 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 eee324bb607..8f8c04afe54 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 5ab4c75fd03..5ab4c75fd03 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 f4bbc65bf69..f4bbc65bf69 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 eee324bb607..8f8c04afe54 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 bbf3a1fc1e2..bbf3a1fc1e2 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 86eead7bfa7..86eead7bfa7 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 eee324bb607..8f8c04afe54 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 ac2e722ed81..ac2e722ed81 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 71c5ec831d3..71c5ec831d3 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 eee324bb607..8f8c04afe54 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 a4caa8c7569..a4caa8c7569 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 a0883b65f5e..a0883b65f5e 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 eee324bb607..8f8c04afe54 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 84493649830..84493649830 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 ed861d121c8..ed861d121c8 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 eee324bb607..8f8c04afe54 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 53ca09e84ec..53ca09e84ec 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 833aa8c0166..833aa8c0166 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 eee324bb607..8f8c04afe54 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 c91919f0851..c91919f0851 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 e2f9b3b08ab..e2f9b3b08ab 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 eee324bb607..8f8c04afe54 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 ff3bed8f5b4..ff3bed8f5b4 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 29fb5e0956b..29fb5e0956b 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 eee324bb607..8f8c04afe54 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 ec649dc8ada..ec649dc8ada 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 208b93382b4..208b93382b4 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 eee324bb607..8f8c04afe54 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 96041aa7d2b..96041aa7d2b 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 7b7157919a0..7b7157919a0 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 eee324bb607..8f8c04afe54 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 04c5b67dda4..04c5b67dda4 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 5aabced8a31..5aabced8a31 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 eee324bb607..8f8c04afe54 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 db6f6bfdc1b..db6f6bfdc1b 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 80f660d62e3..80f660d62e3 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 eee324bb607..8f8c04afe54 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 1db66670688..1db66670688 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 afeac13dc14..afeac13dc14 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 eee324bb607..8f8c04afe54 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 1e710ad49aa..1e710ad49aa 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 0d8763b93d9..0d8763b93d9 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 eee324bb607..8f8c04afe54 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 82fb24cb786..82fb24cb786 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 089ec72973d..089ec72973d 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 eee324bb607..8f8c04afe54 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 ff0b6ce0f9b..ff0b6ce0f9b 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 c2746fae777..c2746fae777 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 eee324bb607..8f8c04afe54 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 cf961268fae..cf961268fae 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 66b62a62a9f..66b62a62a9f 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 eee324bb607..8f8c04afe54 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 890dac15398..890dac15398 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 1a4747c4e3e..1a4747c4e3e 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 eee324bb607..8f8c04afe54 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 0efffd69e04..0efffd69e04 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 c6a073acafc..c6a073acafc 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 eee324bb607..8f8c04afe54 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 b507fb8c2ee..b507fb8c2ee 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 432831775a3..432831775a3 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 eee324bb607..8f8c04afe54 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 1f1eab359c5..1f1eab359c5 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 fb6cf45467e..fb6cf45467e 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 eee324bb607..8f8c04afe54 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 c909854a9a7..c909854a9a7 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 026af909922..026af909922 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 eee324bb607..8f8c04afe54 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 9d8b2182bab..9d8b2182bab 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 be781cf25a9..be781cf25a9 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 eee324bb607..8f8c04afe54 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 68c2fb64a3b..68c2fb64a3b 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 970d858e0e0..970d858e0e0 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 eee324bb607..8f8c04afe54 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 5a180602bc5..5a180602bc5 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 bbbb9103f6d..bbbb9103f6d 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 eee324bb607..8f8c04afe54 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 cdc5d289eec..cdc5d289eec 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 504a4558f75..504a4558f75 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 eee324bb607..8f8c04afe54 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 78a4d06b4b9..78a4d06b4b9 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 65648f12ee0..65648f12ee0 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 eee324bb607..8f8c04afe54 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 6156f5cbe2b..6156f5cbe2b 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 478d0655cf0..478d0655cf0 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 eee324bb607..8f8c04afe54 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 ee33c74ceac..ee33c74ceac 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 5fb04be0665..5fb04be0665 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 eee324bb607..8f8c04afe54 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 bbf8222242f..bbf8222242f 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 d55c7d2c3b2..d55c7d2c3b2 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 eee324bb607..8f8c04afe54 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 3fc903e74d3..3fc903e74d3 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 e957a689176..e957a689176 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 eee324bb607..8f8c04afe54 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 18daf199138..18daf199138 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 604119958d7..604119958d7 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 eee324bb607..8f8c04afe54 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 441d602ca7a..441d602ca7a 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 5a75c7a88f3..5a75c7a88f3 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 eee324bb607..8f8c04afe54 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 e164da14c0f..e164da14c0f 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 7793777f860..7793777f860 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 eee324bb607..8f8c04afe54 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 9f16a5a41e7..9f16a5a41e7 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 b34d62f0e96..b34d62f0e96 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 eee324bb607..8f8c04afe54 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 52cb38d6742..52cb38d6742 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 6c570438f21..6c570438f21 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 eee324bb607..8f8c04afe54 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 c5ee6488443..c5ee6488443 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 de6f97ec6aa..de6f97ec6aa 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 eee324bb607..8f8c04afe54 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 b94d19ad32d..b94d19ad32d 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 d215bfaccc0..d215bfaccc0 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 eee324bb607..8f8c04afe54 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 ec8b8ba23b9..ec8b8ba23b9 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 05ee5297ba0..05ee5297ba0 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 eee324bb607..8f8c04afe54 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 ab5c2e2e91f..ab5c2e2e91f 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 270d5d94da9..5bedd04e092 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 db574777d63..db574777d63 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 154199c9526..154199c9526 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 eee324bb607..8f8c04afe54 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 92cf5b5d93a..92cf5b5d93a 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 7656dd68618..7656dd68618 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 eee324bb607..8f8c04afe54 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 4056287548b..4056287548b 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 708e01ed3a9..708e01ed3a9 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 eee324bb607..8f8c04afe54 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 7dc3bec75b7..7dc3bec75b7 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 e32791dfac8..e32791dfac8 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 eee324bb607..8f8c04afe54 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 370dbb17fdf..370dbb17fdf 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 c16204ed5a7..c16204ed5a7 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 eee324bb607..8f8c04afe54 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 84ce12f2084..84ce12f2084 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 7f31cfc6fe7..7f31cfc6fe7 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 eee324bb607..8f8c04afe54 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 f1a03a5f4a5..f1a03a5f4a5 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 21c332ae9ce..21c332ae9ce 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 eee324bb607..8f8c04afe54 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 9caa6f58bf4..9caa6f58bf4 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 f9321305c17..f9321305c17 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 eee324bb607..8f8c04afe54 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 5d8a4de4f74..5d8a4de4f74 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 974a53462bd..974a53462bd 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 eee324bb607..8f8c04afe54 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 db837d83de0..db837d83de0 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 6b81b89d4c1..6b81b89d4c1 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 eee324bb607..8f8c04afe54 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 ea1e085b747..ea1e085b747 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 f4c156bc0c1..f4c156bc0c1 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 eee324bb607..8f8c04afe54 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 72c039454cb..72c039454cb 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 270d5d94da9..5bedd04e092 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 be15c6c3054..be15c6c3054 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 ba630c0cc43..4349073206f 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 af2b7a20083..af2b7a20083 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 e27549d923a..e27549d923a 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 eee324bb607..8f8c04afe54 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 da26bb12a8b..da26bb12a8b 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 c14195e9521..c14195e9521 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 eee324bb607..8f8c04afe54 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 2ac52c60e8d..2ac52c60e8d 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 0414cabc631..0414cabc631 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 eee324bb607..8f8c04afe54 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 0a5f1f85022..0a5f1f85022 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 d7ac9c9c03f..d7ac9c9c03f 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 eee324bb607..8f8c04afe54 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 11b6ead04d4..11b6ead04d4 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 8e3de5c67f8..8e3de5c67f8 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 eee324bb607..8f8c04afe54 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 8566a4b7efe..8566a4b7efe 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 e2350833929..e2350833929 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 eee324bb607..8f8c04afe54 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 510bc01bd5a..510bc01bd5a 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 51187c45a47..51187c45a47 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 eee324bb607..8f8c04afe54 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 2d41aa33050..2d41aa33050 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 fdc6d5d131b..fdc6d5d131b 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 eee324bb607..8f8c04afe54 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 8e4011a982a..8e4011a982a 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 85364f75957..85364f75957 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 eee324bb607..8f8c04afe54 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 6bcb22f8ccb..6bcb22f8ccb 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 c7cb3720d3e..c7cb3720d3e 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 eee324bb607..8f8c04afe54 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 35f39a552a8..35f39a552a8 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 79ee1ffe0ba..79ee1ffe0ba 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 eee324bb607..8f8c04afe54 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 fa99d9dc2f5..fa99d9dc2f5 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 b6a771543e5..b6a771543e5 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 eee324bb607..8f8c04afe54 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 a74b6d023d0..a74b6d023d0 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 6c319f9b687..6c319f9b687 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 eee324bb607..8f8c04afe54 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 e867afbb8c2..e867afbb8c2 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 211beb8b275..211beb8b275 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 eee324bb607..8f8c04afe54 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 55a0abe1c30..55a0abe1c30 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 6086064a853..6086064a853 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 eee324bb607..8f8c04afe54 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 bce491e67e5..bce491e67e5 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 a86da32e117..a86da32e117 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 eee324bb607..8f8c04afe54 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 2db649e6936..2db649e6936 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 7c76369bd97..7c76369bd97 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 eee324bb607..8f8c04afe54 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 9eccd0b6297..9eccd0b6297 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 118b9266386..118b9266386 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 eee324bb607..8f8c04afe54 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 58143a2371f..58143a2371f 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 3089820d80e..3089820d80e 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 eee324bb607..8f8c04afe54 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 94cb28420f4..94cb28420f4 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 f1bd66c0dab..f1bd66c0dab 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 eee324bb607..8f8c04afe54 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 cae48e0a839..cae48e0a839 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 98f2b23c778..98f2b23c778 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 eee324bb607..8f8c04afe54 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 052ed067e17..052ed067e17 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 eb18b40c189..eb18b40c189 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 eee324bb607..8f8c04afe54 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 48ffa45b49b..48ffa45b49b 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 22d00e4e17e..22d00e4e17e 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 eee324bb607..8f8c04afe54 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 062d269d308..062d269d308 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 099a0191ef9..099a0191ef9 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 eee324bb607..8f8c04afe54 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 516c919f8a7..516c919f8a7 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 7e88b02a4b5..7e88b02a4b5 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 eee324bb607..8f8c04afe54 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 ca761a26c8a..ca761a26c8a 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 7db2f54c162..7db2f54c162 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 eee324bb607..8f8c04afe54 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 f0e455f3aab..f0e455f3aab 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 59f7ba41c48..59f7ba41c48 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 eee324bb607..8f8c04afe54 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 1ba4d2cebf5..1ba4d2cebf5 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 cf53e732397..cf53e732397 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 eee324bb607..8f8c04afe54 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 51c040ccd3f..51c040ccd3f 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 e932afdd60c..e932afdd60c 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 eee324bb607..8f8c04afe54 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 fcca44537ef..fcca44537ef 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 fab526fe7ea..fab526fe7ea 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 eee324bb607..8f8c04afe54 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 9e3e6c0b53e..9e3e6c0b53e 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 d2705961bdf..d2705961bdf 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 eee324bb607..8f8c04afe54 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 59f8cfcaf5d..59f8cfcaf5d 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 6e4c5cd6b56..6e4c5cd6b56 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 eee324bb607..8f8c04afe54 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 30961489be5..30961489be5 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 5aac2bc61f7..5aac2bc61f7 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 eee324bb607..8f8c04afe54 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 5f8c72b28c1..5f8c72b28c1 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 da006d6682c..da006d6682c 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 eee324bb607..8f8c04afe54 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 61799c97ffb..61799c97ffb 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 0c2bd62d47b..0c2bd62d47b 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 eee324bb607..8f8c04afe54 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 5eb786fb5be..5eb786fb5be 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 6fce8bebb06..6fce8bebb06 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 eee324bb607..8f8c04afe54 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 51b65cd5b9b..51b65cd5b9b 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 9ab7bb59e90..9ab7bb59e90 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 eee324bb607..8f8c04afe54 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 7a58b4bfebd..7a58b4bfebd 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 5f08e7a6913..5f08e7a6913 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 eee324bb607..8f8c04afe54 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 ac70e71b915..ac70e71b915 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 797bda818a9..797bda818a9 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 eee324bb607..8f8c04afe54 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 6e2a4fabcd2..6e2a4fabcd2 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 6e2a4fabcd2..6e2a4fabcd2 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 eee324bb607..8f8c04afe54 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 47150388a7a..47150388a7a 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 8c71567f3a2..8c71567f3a2 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 0f8cf0fb161..a603bef54ed 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 8e01e97c1d2..8e01e97c1d2 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 f526317f26b..f526317f26b 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 eee324bb607..8f8c04afe54 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 f1fde4acf65..f1fde4acf65 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 9c4715c689c..9c4715c689c 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 eee324bb607..8f8c04afe54 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 a73bc8800f6..a73bc8800f6 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 e569656a95f..e569656a95f 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 eee324bb607..8f8c04afe54 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 5cfb972bb5f..5cfb972bb5f 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 ca2003e3107..ca2003e3107 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 eee324bb607..8f8c04afe54 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 ba41965df26..ba41965df26 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 3c4f9aed25c..3c4f9aed25c 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 eee324bb607..8f8c04afe54 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 851add2e6cd..851add2e6cd 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 39139ce3c86..39139ce3c86 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 eee324bb607..8f8c04afe54 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 3f330b9bb51..3f330b9bb51 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 73b4b95275c..73b4b95275c 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 eee324bb607..8f8c04afe54 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 15be6f0095d..15be6f0095d 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 110e2807e9b..110e2807e9b 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 eee324bb607..8f8c04afe54 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 dbd80b1e0cd..dbd80b1e0cd 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 9266eb99aec..9266eb99aec 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 eee324bb607..8f8c04afe54 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 71027159520..71027159520 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 37e5df6e79e..37e5df6e79e 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 eee324bb607..8f8c04afe54 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 5afa320647f..5afa320647f 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 d8cfeb870fe..d8cfeb870fe 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 eee324bb607..8f8c04afe54 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 3e5c652aeeb..3e5c652aeeb 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 3893a3ea8b5..3893a3ea8b5 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 eee324bb607..8f8c04afe54 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 e0ddfec96c9..e0ddfec96c9 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 557f29655be..557f29655be 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 eee324bb607..8f8c04afe54 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 9a3521cd9b3..9a3521cd9b3 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 a48d43f3fdc..a48d43f3fdc 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 eee324bb607..8f8c04afe54 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 d4f74e8dc08..d4f74e8dc08 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 d5a19ed8ea1..d5a19ed8ea1 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 eee324bb607..8f8c04afe54 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 d50b571fdef..d50b571fdef 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 c5389658b16..c5389658b16 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 eee324bb607..8f8c04afe54 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 6eca107f7fb..6eca107f7fb 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 afeec637dd8..afeec637dd8 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 eee324bb607..8f8c04afe54 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 0d86ce0e677..0d86ce0e677 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 18f5590ef98..18f5590ef98 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 eee324bb607..8f8c04afe54 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 5cd758efec8..5cd758efec8 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 c50fd344c4e..c50fd344c4e 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 eee324bb607..8f8c04afe54 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 e2bedf1e187..e2bedf1e187 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 28d1aabe8d2..28d1aabe8d2 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 eee324bb607..8f8c04afe54 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 14901bec18c..14901bec18c 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 6e952b89408..6e952b89408 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 eee324bb607..8f8c04afe54 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 3d7752c1ff3..3d7752c1ff3 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 4359ec58c08..4359ec58c08 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 eee324bb607..8f8c04afe54 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 672139e643e..672139e643e 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 b84dcb3263d..b84dcb3263d 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 eee324bb607..8f8c04afe54 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 b6867602291..b6867602291 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 370fd83097d..370fd83097d 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 eee324bb607..8f8c04afe54 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 f767e929b8c..f767e929b8c 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 f37d20f4d11..f37d20f4d11 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 eee324bb607..8f8c04afe54 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 9dd7437db0a..9dd7437db0a 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 2fdc4b7b125..2fdc4b7b125 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 eee324bb607..8f8c04afe54 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 050a5323bd6..050a5323bd6 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 48d55d42ce3..48d55d42ce3 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 eee324bb607..8f8c04afe54 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 c68241bc9ec..c68241bc9ec 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 84161c1c434..84161c1c434 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 eee324bb607..8f8c04afe54 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 15cbe3d5ac9..15cbe3d5ac9 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 3f580358e35..3f580358e35 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 eee324bb607..8f8c04afe54 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 c795d4ebeb0..c795d4ebeb0 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 261d374dc86..261d374dc86 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 eee324bb607..8f8c04afe54 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 8a20efaed07..8a20efaed07 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 29717189de7..29717189de7 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 eee324bb607..8f8c04afe54 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 41bc7e20f92..41bc7e20f92 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 e172e2381a7..e172e2381a7 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 eee324bb607..8f8c04afe54 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 3557a689eb5..3557a689eb5 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 fba9c841dea..fba9c841dea 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 eee324bb607..8f8c04afe54 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 1075010e224..1075010e224 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 f3ef692fb61..f3ef692fb61 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 eee324bb607..8f8c04afe54 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 14cff14af7f..14cff14af7f 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 ee777c46ff2..ee777c46ff2 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 eee324bb607..8f8c04afe54 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 64dc3e1a7a0..64dc3e1a7a0 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 860a713a0b6..860a713a0b6 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 eee324bb607..8f8c04afe54 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 47d1aa79f66..47d1aa79f66 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 38c9a6036d2..38c9a6036d2 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 eee324bb607..8f8c04afe54 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 d9f7098b347..d9f7098b347 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 a43a6589081..a43a6589081 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 eee324bb607..8f8c04afe54 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 454bf560f9f..454bf560f9f 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 d8895e6dbfa..d8895e6dbfa 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 eee324bb607..8f8c04afe54 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 902b6d7a9ac..902b6d7a9ac 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 5653d3d3f3f..5653d3d3f3f 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 eee324bb607..8f8c04afe54 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 66d221dbbb4..66d221dbbb4 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 ae643a1bc46..ae643a1bc46 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 eee324bb607..8f8c04afe54 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 934c52018ec..934c52018ec 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 2f54f7fe5b7..2f54f7fe5b7 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 eee324bb607..8f8c04afe54 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 a88a439f243..a88a439f243 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 ab5a6d971f9..ab5a6d971f9 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 eee324bb607..8f8c04afe54 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 116045cc832..116045cc832 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 a33df23eaca..a33df23eaca 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 eee324bb607..8f8c04afe54 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 ff0797688e7..ff0797688e7 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 c6338ea17b0..c6338ea17b0 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 eee324bb607..8f8c04afe54 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 e364879e721..e364879e721 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 81907f6776d..81907f6776d 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 eee324bb607..8f8c04afe54 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 61c6127690e..61c6127690e 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 929d3f00db0..929d3f00db0 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 eee324bb607..8f8c04afe54 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 51060375898..51060375898 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 e35e99bf80d..e35e99bf80d 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 eee324bb607..8f8c04afe54 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 0d060c26998..0d060c26998 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 daf50a668e5..daf50a668e5 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 eee324bb607..8f8c04afe54 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 cf90e8b74f3..cf90e8b74f3 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 30fe4361801..30fe4361801 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 eee324bb607..8f8c04afe54 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 faa65c7f2ba..faa65c7f2ba 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 8f5bf5189e1..8f5bf5189e1 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 eee324bb607..8f8c04afe54 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 25c06c3bbc8..25c06c3bbc8 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 5265c3ec303..5265c3ec303 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 eee324bb607..8f8c04afe54 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 81e3230ffed..81e3230ffed 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 1746645e0c3..1746645e0c3 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 eee324bb607..8f8c04afe54 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 c681f29c5b6..c681f29c5b6 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 84821c33695..84821c33695 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 eee324bb607..8f8c04afe54 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 6f12b2aa5ee..6f12b2aa5ee 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 571e21b861e..571e21b861e 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 eee324bb607..8f8c04afe54 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 f4437a0a2b4..f4437a0a2b4 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 e5d2e1e2813..e5d2e1e2813 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 eee324bb607..8f8c04afe54 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 78de390e21e..78de390e21e 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 b7467715369..b7467715369 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 eee324bb607..8f8c04afe54 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 15635507ff7..15635507ff7 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 95ea6cc73c2..95ea6cc73c2 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 eee324bb607..8f8c04afe54 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 806700a5524..806700a5524 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 50f48acb17e..50f48acb17e 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 eee324bb607..8f8c04afe54 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 ed89c6d02df..ed89c6d02df 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 e96ca3e0ecc..e96ca3e0ecc 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 eee324bb607..8f8c04afe54 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 d5cda8e6c0d..d5cda8e6c0d 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 1d4a1bd34e2..1d4a1bd34e2 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 eee324bb607..8f8c04afe54 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 2b5efc5d4d1..2b5efc5d4d1 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 57dce333101..57dce333101 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 eee324bb607..8f8c04afe54 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 e9334e323e6..e9334e323e6 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 ddf918de7ff..ddf918de7ff 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 eee324bb607..8f8c04afe54 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 a5c4253641d..a5c4253641d 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 b634e26c5fa..b634e26c5fa 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 eee324bb607..8f8c04afe54 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 c2ad57e3a06..c2ad57e3a06 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 0c4f0dc6c08..0c4f0dc6c08 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 eee324bb607..8f8c04afe54 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 ad79d9654f2..ad79d9654f2 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 a2020a68e46..a2020a68e46 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 eee324bb607..8f8c04afe54 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 f40a29467d0..f40a29467d0 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 780e571ddc3..780e571ddc3 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 eee324bb607..8f8c04afe54 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 1d843305d98..1d843305d98 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 40c26cadfba..40c26cadfba 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 eee324bb607..8f8c04afe54 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 30fdfbef100..30fdfbef100 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 7325ab2c740..7325ab2c740 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 eee324bb607..8f8c04afe54 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 92907b63dc2..92907b63dc2 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 9ed005067b4..9ed005067b4 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 eee324bb607..8f8c04afe54 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 7f0c283498a..7f0c283498a 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 bc2b88bf401..bc2b88bf401 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 eee324bb607..8f8c04afe54 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 77a9e8a268f..77a9e8a268f 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 cfafefd2b17..cfafefd2b17 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 eee324bb607..8f8c04afe54 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 68ae5dcaaf7..68ae5dcaaf7 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 0aa2b791227..0aa2b791227 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 eee324bb607..8f8c04afe54 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 31253becd72..31253becd72 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 4e3045fc6aa..4e3045fc6aa 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 eee324bb607..8f8c04afe54 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 a550e54f001..a550e54f001 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 3557a63ea82..3557a63ea82 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 eee324bb607..8f8c04afe54 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 d4bc4d4dc16..d4bc4d4dc16 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 398ec597812..398ec597812 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 eee324bb607..8f8c04afe54 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 51aa74d9bc4..51aa74d9bc4 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 56e5139b675..56e5139b675 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 eee324bb607..8f8c04afe54 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 ae7cffeb5ed..ae7cffeb5ed 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 6ba02c3ad1a..6ba02c3ad1a 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 eee324bb607..8f8c04afe54 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 6facd47e753..6facd47e753 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 4798912c9fb..4798912c9fb 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 eee324bb607..8f8c04afe54 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 b1222b9e29c..b1222b9e29c 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 6fa1888e8f5..6fa1888e8f5 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 eee324bb607..8f8c04afe54 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 e53ac460349..e53ac460349 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 1d248a682d9..1d248a682d9 100644
--- a/util/CMakeLists.linux.txt
+++ b/util/CMakeLists.linux-x86_64.txt
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
index eee324bb607..8f8c04afe54 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 b63f9cf0470..b63f9cf0470 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 79398a4034f..79398a4034f 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 eee324bb607..8f8c04afe54 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 08f23dc3942..08f23dc3942 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 7447144d610..7447144d610 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 eee324bb607..8f8c04afe54 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 0d29d4f392e..0d29d4f392e 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 39aee1cae74..39aee1cae74 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 eee324bb607..8f8c04afe54 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 e33921e39da..e33921e39da 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 48b1ad4e47f..48b1ad4e47f 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 eee324bb607..8f8c04afe54 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 afe23048006..afe23048006 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 9cc70c525ff..9cc70c525ff 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 eee324bb607..8f8c04afe54 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 3bb8e6dd5d3..3bb8e6dd5d3 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 4a5c4eb7949..4a5c4eb7949 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 eee324bb607..8f8c04afe54 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 bda2e670994..bda2e670994 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 34f85bdba67..34f85bdba67 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 eee324bb607..8f8c04afe54 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 82fbe61796d..82fbe61796d 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 a2eac3443c6..a2eac3443c6 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 eee324bb607..8f8c04afe54 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 bef496eeccc..bef496eeccc 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 c66927f2945..c66927f2945 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 eee324bb607..8f8c04afe54 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 0ae59a25de0..0ae59a25de0 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 4fa1eca5ef0..4fa1eca5ef0 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 eee324bb607..8f8c04afe54 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 d68838d8282..d68838d8282 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 e53bddf016b..e53bddf016b 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 eee324bb607..8f8c04afe54 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 601a05c08f3..601a05c08f3 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 e12fd5266e9..e12fd5266e9 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 eee324bb607..8f8c04afe54 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 c18d69d6cf9..c18d69d6cf9 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 37da1726ef2..37da1726ef2 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 eee324bb607..8f8c04afe54 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 c1c07fd82c9..c1c07fd82c9 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 284e9732b57..284e9732b57 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 eee324bb607..8f8c04afe54 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 68b0f9d3f56..68b0f9d3f56 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 93d433b2b5f..93d433b2b5f 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 eee324bb607..8f8c04afe54 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 720dc8da9cf..720dc8da9cf 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 2eab395ad0e..2eab395ad0e 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 eee324bb607..8f8c04afe54 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 bfd628cfab9..bfd628cfab9 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 01bbd84e654..01bbd84e654 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 eee324bb607..8f8c04afe54 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 05db278101e..05db278101e 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 c6798be4dd4..c6798be4dd4 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 eee324bb607..8f8c04afe54 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 be525087d95..be525087d95 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 51c682e7bb6..51c682e7bb6 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 eee324bb607..8f8c04afe54 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 daaf80f4ca6..daaf80f4ca6 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 d4d56adf6d3..d4d56adf6d3 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 eee324bb607..8f8c04afe54 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 8ab893781a9..8ab893781a9 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 2b7e0540c55..2b7e0540c55 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 eee324bb607..8f8c04afe54 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 c8aad33cf25..c8aad33cf25 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 0e6f16e183f..0e6f16e183f 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 eee324bb607..8f8c04afe54 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 3a0d583d7e1..3a0d583d7e1 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 761cb66fcc6..761cb66fcc6 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 eee324bb607..8f8c04afe54 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 52990414c99..52990414c99 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 a8ae37f8d29..a8ae37f8d29 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 eee324bb607..8f8c04afe54 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 7135720239c..7135720239c 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 bcdc889119d..bcdc889119d 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 eee324bb607..8f8c04afe54 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 03cc07ea87b..03cc07ea87b 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 50053ec49e6..50053ec49e6 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 eee324bb607..8f8c04afe54 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 21ff4fac3cc..21ff4fac3cc 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 606cbf49d97..606cbf49d97 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 eee324bb607..8f8c04afe54 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 3cc51cf3477..3cc51cf3477 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 4646f3e58d5..4646f3e58d5 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 eee324bb607..8f8c04afe54 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 25ce270b595..25ce270b595 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 5b78d857a59..5b78d857a59 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 eee324bb607..8f8c04afe54 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 05e64c03cd9..05e64c03cd9 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 ed9bf6e4401..ed9bf6e4401 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 eee324bb607..8f8c04afe54 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 0594957b5ef..0594957b5ef 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 1858621a0ff..1858621a0ff 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 eee324bb607..8f8c04afe54 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 c149b101bd8..c149b101bd8 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 a476425344c..a476425344c 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 eee324bb607..8f8c04afe54 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 be93d4d9283..be93d4d9283 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 07c2d8aaf41..07c2d8aaf41 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 eee324bb607..8f8c04afe54 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 efe3d0b3c55..efe3d0b3c55 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 784e5d05c40..784e5d05c40 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 eee324bb607..8f8c04afe54 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 c4b11025238..c4b11025238 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 0cba04d287e..0cba04d287e 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 eee324bb607..8f8c04afe54 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 378ee761763..378ee761763 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 1fd378a19b2..1fd378a19b2 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 eee324bb607..8f8c04afe54 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 54958ea9c97..54958ea9c97 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 b42ddb61933..b42ddb61933 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 eee324bb607..8f8c04afe54 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 0bf4ffde6d6..0bf4ffde6d6 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 b9757c9cadf..b9757c9cadf 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 eee324bb607..8f8c04afe54 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 d5c1a02d8f8..d5c1a02d8f8 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 ccd7e3d8914..ccd7e3d8914 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 eee324bb607..8f8c04afe54 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 c7b2cf5c69f..c7b2cf5c69f 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 d34fc4953d3..d34fc4953d3 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 eee324bb607..8f8c04afe54 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 65ce705be6d..65ce705be6d 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 372c18f418a..372c18f418a 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 eee324bb607..8f8c04afe54 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 0d2a66e5aa9..0d2a66e5aa9 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 96fec7bf6ae..96fec7bf6ae 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 eee324bb607..8f8c04afe54 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 ad3a4d2e09c..ad3a4d2e09c 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 7bdff9b65aa..7bdff9b65aa 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 eee324bb607..8f8c04afe54 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 3a89a435c51..3a89a435c51 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 513fdcb22a4..513fdcb22a4 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 eee324bb607..8f8c04afe54 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 0400232ea15..0400232ea15 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 31981ce6357..31981ce6357 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 eee324bb607..8f8c04afe54 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 f86dbf529e8..f86dbf529e8 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 30dbc50e569..30dbc50e569 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 eee324bb607..8f8c04afe54 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 ca0d9f4ad8b..ca0d9f4ad8b 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 84fcb84dc48..84fcb84dc48 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 eee324bb607..8f8c04afe54 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 c3055be15b3..c3055be15b3 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 78f1bc525d8..78f1bc525d8 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 eee324bb607..8f8c04afe54 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 0be623c2766..0be623c2766 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 14132a6af21..14132a6af21 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 eee324bb607..8f8c04afe54 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 2e90ec50b93..2e90ec50b93 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 fcab171034c..fcab171034c 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 eee324bb607..8f8c04afe54 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 781c5656938..781c5656938 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 61ef2c450d1..61ef2c450d1 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 eee324bb607..8f8c04afe54 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 bfeef5f34e2..bfeef5f34e2 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 bd5bbe20d58..bd5bbe20d58 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 eee324bb607..8f8c04afe54 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 ea6c677000c..ea6c677000c 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 1411ab1a646..1411ab1a646 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 eee324bb607..8f8c04afe54 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 3daf2d8ca5c..3daf2d8ca5c 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 d06f8df5338..d06f8df5338 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 eee324bb607..8f8c04afe54 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 deba76a9c32..deba76a9c32 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 ba630c0cc43..4349073206f 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 4c94c1dbbb5..4c94c1dbbb5 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 ba630c0cc43..4349073206f 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 ed0479c566e..ed0479c566e 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 1d0fcaec386..1d0fcaec386 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 eee324bb607..8f8c04afe54 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 7df629b15f9..7df629b15f9 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 e8efc076e35..e8efc076e35 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 eee324bb607..8f8c04afe54 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 68d858a5786..68d858a5786 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 0fe8358c6a4..0fe8358c6a4 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 eee324bb607..8f8c04afe54 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 0301c20583f..0301c20583f 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 f927e067ce4..f927e067ce4 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 eee324bb607..8f8c04afe54 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 2632812048e..2632812048e 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 9428ff308e7..9428ff308e7 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 eee324bb607..8f8c04afe54 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 cf20eaa1b5f..cf20eaa1b5f 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 61a0b43247b..61a0b43247b 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 eee324bb607..8f8c04afe54 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 f1458a7b522..f1458a7b522 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 c453a1edb1e..c453a1edb1e 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 eee324bb607..8f8c04afe54 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 ad4318a3025..ad4318a3025 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 f0551fda25f..f0551fda25f 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 eee324bb607..8f8c04afe54 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 cacf51b3504..cacf51b3504 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 49306bc945a..49306bc945a 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 eee324bb607..8f8c04afe54 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 7e3b60a4340..7e3b60a4340 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 8bef9d5b299..8bef9d5b299 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 eee324bb607..8f8c04afe54 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 5f981fc02b4..5f981fc02b4 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 cc1dd88a82c..cc1dd88a82c 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 eee324bb607..8f8c04afe54 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 03db99f5d46..03db99f5d46 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 2a4b4a38bdd..2a4b4a38bdd 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 eee324bb607..8f8c04afe54 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 589355bf844..589355bf844 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 00d7bccd97e..00d7bccd97e 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 eee324bb607..8f8c04afe54 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 5561c48fa80..5561c48fa80 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 f97f0d1fbd0..f97f0d1fbd0 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 eee324bb607..8f8c04afe54 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 880fd7ff67d..880fd7ff67d 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 0774dd133fa..0774dd133fa 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 eee324bb607..8f8c04afe54 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 4a479fb693d..4a479fb693d 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 0d1e9339726..0d1e9339726 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 eee324bb607..8f8c04afe54 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 7b235ca689f..7b235ca689f 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 e41509a78f4..e41509a78f4 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 eee324bb607..8f8c04afe54 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 6db91dc19dd..6db91dc19dd 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 ca7e9fc114d..ca7e9fc114d 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 eee324bb607..8f8c04afe54 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 2ca53da55f1..2ca53da55f1 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 ec3cfb7afcd..ec3cfb7afcd 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 eee324bb607..8f8c04afe54 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 24bf99401fe..24bf99401fe 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 f9372dcb37f..f9372dcb37f 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 eee324bb607..8f8c04afe54 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 ec5aa8425b4..ec5aa8425b4 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 28673a5025e..28673a5025e 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 eee324bb607..8f8c04afe54 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 6c0003e00c9..6c0003e00c9 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 db0d7f99c96..db0d7f99c96 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 eee324bb607..8f8c04afe54 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 7c9fa1b9471..7c9fa1b9471 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 cf6ffe3ed47..cf6ffe3ed47 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 eee324bb607..8f8c04afe54 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 c00fcd3b079..c00fcd3b079 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 ef4dc6b054c..ef4dc6b054c 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 eee324bb607..8f8c04afe54 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 c43891962ef..c43891962ef 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 b9411234446..b9411234446 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 eee324bb607..8f8c04afe54 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 b1791b3fba1..b1791b3fba1 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 982d9742b2b..982d9742b2b 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 eee324bb607..8f8c04afe54 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 ff0ea8a96ce..ff0ea8a96ce 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 d29505f4b95..d29505f4b95 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 eee324bb607..8f8c04afe54 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 7456dd94558..7456dd94558 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 84177df9876..84177df9876 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 eee324bb607..8f8c04afe54 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 50e400c5254..50e400c5254 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 cad216c5d3c..cad216c5d3c 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 eee324bb607..8f8c04afe54 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 279e7bdb8f0..279e7bdb8f0 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 ec53987ef5e..ec53987ef5e 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 eee324bb607..8f8c04afe54 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 525fefdd9ae..525fefdd9ae 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 c96aa5c0528..c96aa5c0528 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 eee324bb607..8f8c04afe54 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 9c6c88c18a0..9c6c88c18a0 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 4bb7d462132..4bb7d462132 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 eee324bb607..8f8c04afe54 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 304172081c6..304172081c6 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 249171c2b96..249171c2b96 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 eee324bb607..8f8c04afe54 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 097ee5fb7ff..097ee5fb7ff 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 289d40aed81..289d40aed81 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 eee324bb607..8f8c04afe54 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 b39c82355fa..b39c82355fa 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 8a0af179fcf..8a0af179fcf 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 eee324bb607..8f8c04afe54 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 797ce866c9c..797ce866c9c 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 6f01238c284..6f01238c284 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 eee324bb607..8f8c04afe54 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 83c328d60b8..83c328d60b8 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 5a4de11188f..5a4de11188f 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 eee324bb607..8f8c04afe54 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 6cb0244a1b5..6cb0244a1b5 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 18f93a637d5..18f93a637d5 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 eee324bb607..8f8c04afe54 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 c7007dc50e8..c7007dc50e8 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 07368b8b1fa..07368b8b1fa 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 eee324bb607..8f8c04afe54 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 82a526667cb..82a526667cb 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 bdf8c7770e3..bdf8c7770e3 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 eee324bb607..8f8c04afe54 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 98a7d0c7c2b..98a7d0c7c2b 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 72f5a51e211..72f5a51e211 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 eee324bb607..8f8c04afe54 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 c8c2529e7ba..c8c2529e7ba 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 af30c565150..af30c565150 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 eee324bb607..8f8c04afe54 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 e06a3623235..e06a3623235 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 bc6836ca5f8..bc6836ca5f8 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 eee324bb607..8f8c04afe54 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 c687bf61ca0..c687bf61ca0 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 757c153aa14..757c153aa14 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 eee324bb607..8f8c04afe54 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 61cea37ccdc..61cea37ccdc 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 ae4f1bd9913..ae4f1bd9913 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 eee324bb607..8f8c04afe54 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 cff7685b875..cff7685b875 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 fca392964d3..fca392964d3 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 eee324bb607..8f8c04afe54 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 7f7b24842e7..7f7b24842e7 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 915b761bc90..915b761bc90 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 eee324bb607..8f8c04afe54 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 fa2959acf10..fa2959acf10 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 e2ed75d6d84..e2ed75d6d84 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 eee324bb607..8f8c04afe54 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 ed93748cb81..ed93748cb81 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 7202f87c0b3..7202f87c0b3 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 eee324bb607..8f8c04afe54 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 d0f8a190e47..d0f8a190e47 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 9fabe549b2e..9fabe549b2e 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 eee324bb607..8f8c04afe54 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 5efa3c83bcc..5efa3c83bcc 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 7acb7b8aecf..7acb7b8aecf 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 eee324bb607..8f8c04afe54 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 a7199003699..a7199003699 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 1740fc0d6bb..1740fc0d6bb 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 eee324bb607..8f8c04afe54 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 a4583e59263..a4583e59263 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 68fdf96dcec..68fdf96dcec 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 eee324bb607..8f8c04afe54 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 b2ddd12c3bc..b2ddd12c3bc 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 2b8d36d1f85..2b8d36d1f85 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 eee324bb607..8f8c04afe54 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 b58773b4d19..b58773b4d19 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 44089a341f7..44089a341f7 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 eee324bb607..8f8c04afe54 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 d66fdd861bb..d66fdd861bb 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 58ffd370d26..58ffd370d26 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 eee324bb607..8f8c04afe54 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 944283370d4..944283370d4 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 881ee4ed1b4..881ee4ed1b4 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 eee324bb607..8f8c04afe54 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 050ab290ad9..050ab290ad9 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 e037e0d38e5..e037e0d38e5 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 eee324bb607..8f8c04afe54 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 7a21a804543..7a21a804543 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 19c69222682..19c69222682 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 eee324bb607..8f8c04afe54 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 8e61fae0307..8e61fae0307 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 fca529d93f6..fca529d93f6 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 eee324bb607..8f8c04afe54 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 a67c735a939..a67c735a939 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 5f19f08bf46..5f19f08bf46 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 eee324bb607..8f8c04afe54 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 a02c7ca2b97..a02c7ca2b97 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 ea0817c47bd..ea0817c47bd 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 eee324bb607..8f8c04afe54 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 f30062488e5..f30062488e5 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 d14883cc6f8..d14883cc6f8 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 eee324bb607..8f8c04afe54 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 6bc59813714..6bc59813714 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 a84153bfb74..a84153bfb74 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 eee324bb607..8f8c04afe54 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 ae6ae3abc0e..ae6ae3abc0e 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 11d91e59fc0..11d91e59fc0 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 eee324bb607..8f8c04afe54 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 2be4784d6d6..2be4784d6d6 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 58097501de0..58097501de0 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 eee324bb607..8f8c04afe54 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 4d09e79f3ac..4d09e79f3ac 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 b78dac11e71..b78dac11e71 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 eee324bb607..8f8c04afe54 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 44a8808b89f..44a8808b89f 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 6e9bb14df43..6e9bb14df43 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 eee324bb607..8f8c04afe54 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 d921d4bdc71..d921d4bdc71 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 d9fadfcacbf..d9fadfcacbf 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 eee324bb607..8f8c04afe54 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 ebaa431183b..ebaa431183b 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 81ba66cf19b..81ba66cf19b 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 eee324bb607..8f8c04afe54 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 fea407f206a..fea407f206a 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 bdc9d1dd8ee..bdc9d1dd8ee 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 eee324bb607..8f8c04afe54 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 f06b7c0fff0..f06b7c0fff0 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 ea8d635a5c9..ea8d635a5c9 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 eee324bb607..8f8c04afe54 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 ebb5e769c71..ebb5e769c71 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 d5b228940e6..d5b228940e6 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 eee324bb607..8f8c04afe54 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 c0cec4da9f8..c0cec4da9f8 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 947d35199c1..947d35199c1 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 eee324bb607..8f8c04afe54 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 52e306422b7..52e306422b7 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 19a6d49278d..19a6d49278d 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 eee324bb607..8f8c04afe54 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 277f032734c..277f032734c 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 a646a9a5b0c..a646a9a5b0c 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 eee324bb607..8f8c04afe54 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 55f3c886ac7..55f3c886ac7 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 60de3239637..60de3239637 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 eee324bb607..8f8c04afe54 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 3b9d5d19d61..3b9d5d19d61 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 6e5b760dbdf..6e5b760dbdf 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 eee324bb607..8f8c04afe54 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 411c78bad7d..411c78bad7d 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 0f62710fa19..0f62710fa19 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 eee324bb607..8f8c04afe54 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 e370f32dc2d..e370f32dc2d 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 3b640c12463..3b640c12463 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 eee324bb607..8f8c04afe54 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 c8d19076be2..c8d19076be2 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 2820945b225..2820945b225 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 eee324bb607..8f8c04afe54 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 0fb8322dd6d..0fb8322dd6d 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 9c268818731..9c268818731 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 eee324bb607..8f8c04afe54 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 924d66edc5b..924d66edc5b 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 2189242369a..2189242369a 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 eee324bb607..8f8c04afe54 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 8f090fc2c6c..8f090fc2c6c 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 48d73efe8dd..48d73efe8dd 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 eee324bb607..8f8c04afe54 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 29f504e07a1..29f504e07a1 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 4d21fbe9ad3..4d21fbe9ad3 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 eee324bb607..8f8c04afe54 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 fd975d9e4da..fd975d9e4da 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 0ab627b682a..0ab627b682a 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 eee324bb607..8f8c04afe54 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 786ca876e93..786ca876e93 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 9ccffcb3b57..9ccffcb3b57 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 eee324bb607..8f8c04afe54 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 200bf02e07d..200bf02e07d 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 fb84f2005bd..fb84f2005bd 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 eee324bb607..8f8c04afe54 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 1da110d3356..1da110d3356 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 fdd743d7456..fdd743d7456 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 eee324bb607..8f8c04afe54 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 ff157c3f068..ff157c3f068 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 36145e1d10e..36145e1d10e 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 eee324bb607..8f8c04afe54 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 5a2d28c0c17..5a2d28c0c17 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 d0c99c829f6..d0c99c829f6 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 eee324bb607..8f8c04afe54 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 0b73809289c..0b73809289c 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 2be744bfcc7..2be744bfcc7 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 eee324bb607..8f8c04afe54 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 e90eb9e564c..e90eb9e564c 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 29c51c328c1..29c51c328c1 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 eee324bb607..8f8c04afe54 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 7b1e0c5eedb..7b1e0c5eedb 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 76a073859fb..76a073859fb 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 eee324bb607..8f8c04afe54 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 b912d66f3a7..b912d66f3a7 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 999a49f6a19..999a49f6a19 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 eee324bb607..8f8c04afe54 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 573a98a8e66..573a98a8e66 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 e10bd784187..e10bd784187 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 eee324bb607..8f8c04afe54 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 4cab6afc300..4cab6afc300 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 b1825d6d1ab..b1825d6d1ab 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 eee324bb607..8f8c04afe54 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 9738ee1e46a..9738ee1e46a 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 2c1e1761e72..2c1e1761e72 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 eee324bb607..8f8c04afe54 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 f446f668462..f446f668462 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 e93f011dede..e93f011dede 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 eee324bb607..8f8c04afe54 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 a0a5f555966..a0a5f555966 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 9ad4eb6ea39..9ad4eb6ea39 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 eee324bb607..8f8c04afe54 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 97d37605061..97d37605061 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 3b9558ee2de..3b9558ee2de 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 eee324bb607..8f8c04afe54 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 177e6eda102..177e6eda102 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 b94366797e2..b94366797e2 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 eee324bb607..8f8c04afe54 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 cf5d7ddabfb..cf5d7ddabfb 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 414016cadb4..414016cadb4 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 eee324bb607..8f8c04afe54 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 57fa13ff701..57fa13ff701 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 7cd8c50e924..7cd8c50e924 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 eee324bb607..8f8c04afe54 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 6e198308522..6e198308522 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 f975d74e84f..f975d74e84f 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 eee324bb607..8f8c04afe54 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 8a70b7e5ed3..8a70b7e5ed3 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 d70963e423e..d70963e423e 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 eee324bb607..8f8c04afe54 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 5e8e3539aaf..5e8e3539aaf 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 57ede8f4a29..57ede8f4a29 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 eee324bb607..8f8c04afe54 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 c443e626fd1..c443e626fd1 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 4a2ffea3948..4a2ffea3948 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 eee324bb607..8f8c04afe54 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 e97f7456a56..e97f7456a56 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 829ec1d1880..829ec1d1880 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 eee324bb607..8f8c04afe54 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 623ce422879..623ce422879 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 e7dfe3ffe48..e7dfe3ffe48 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 eee324bb607..8f8c04afe54 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 ce1cc8a65cb..ce1cc8a65cb 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 60c0e5574d8..60c0e5574d8 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 eee324bb607..8f8c04afe54 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 5677b3ecf4b..5677b3ecf4b 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 3d71075132a..3d71075132a 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 eee324bb607..8f8c04afe54 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 3ae2330909e..3ae2330909e 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 c56508b3c09..c56508b3c09 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 eee324bb607..8f8c04afe54 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 d1aa8154fbf..d1aa8154fbf 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 6de319761d6..6de319761d6 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 eee324bb607..8f8c04afe54 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 fa3b2d5eefb..fa3b2d5eefb 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 a0be4d86318..a0be4d86318 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 eee324bb607..8f8c04afe54 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 e533541cd43..e533541cd43 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 f82d9f019b7..f82d9f019b7 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 eee324bb607..8f8c04afe54 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 ddf83e16b37..ddf83e16b37 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 056cdb575ad..056cdb575ad 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 eee324bb607..8f8c04afe54 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 e82ec0d41ac..e82ec0d41ac 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 9e4b855487f..9e4b855487f 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 eee324bb607..8f8c04afe54 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 407bd91dcb5..407bd91dcb5 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 940c40b1689..940c40b1689 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 eee324bb607..8f8c04afe54 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 c8431e865bd..c8431e865bd 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 985a5c70ff3..985a5c70ff3 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 eee324bb607..8f8c04afe54 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 7ec4d4514bf..7ec4d4514bf 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 ba8cdee953e..ba8cdee953e 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 eee324bb607..8f8c04afe54 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 8f457ba4dab..8f457ba4dab 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 f0dbbe779df..f0dbbe779df 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 eee324bb607..8f8c04afe54 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 4de87f9588a..4de87f9588a 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 bcfd6eb80fa..bcfd6eb80fa 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 eee324bb607..8f8c04afe54 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 3588110f9a0..3588110f9a0 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 0378bd6e5e0..0378bd6e5e0 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 eee324bb607..8f8c04afe54 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 f7bb91913a9..f7bb91913a9 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 d4e1a53b136..d4e1a53b136 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 eee324bb607..8f8c04afe54 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 1f61f525b37..1f61f525b37 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 d863010351e..d863010351e 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 eee324bb607..8f8c04afe54 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 3e80449fbe0..3e80449fbe0 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 267052dcc1d..267052dcc1d 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 eee324bb607..8f8c04afe54 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 3656f42ea20..3656f42ea20 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 809b67173cf..809b67173cf 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 eee324bb607..8f8c04afe54 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 c8eb20052c7..c8eb20052c7 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 9554d74f3ed..9554d74f3ed 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 eee324bb607..8f8c04afe54 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 e21e3a2928e..e21e3a2928e 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 2f01eb2c6d3..2f01eb2c6d3 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 eee324bb607..8f8c04afe54 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 987f3e52d21..987f3e52d21 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 37ceb4a01ef..37ceb4a01ef 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 eee324bb607..8f8c04afe54 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 823ec24b9fd..823ec24b9fd 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 9f5d4324fd3..9f5d4324fd3 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 eee324bb607..8f8c04afe54 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 1a25f182340..1a25f182340 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 2662cfd7a64..2662cfd7a64 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 eee324bb607..8f8c04afe54 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 d2266274164..d2266274164 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 761997487ef..761997487ef 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 eee324bb607..8f8c04afe54 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 5035823f904..5035823f904 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 6efae41378f..6efae41378f 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 eee324bb607..8f8c04afe54 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 e5a4cf36f5a..e5a4cf36f5a 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 1205ad3578b..1205ad3578b 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 eee324bb607..8f8c04afe54 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 1397808681e..1397808681e 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 2e3926b260f..2e3926b260f 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 eee324bb607..8f8c04afe54 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 3233a6aacbb..3233a6aacbb 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 c461b1be417..c461b1be417 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 eee324bb607..8f8c04afe54 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 c848e589bdd..c848e589bdd 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 bd6045c8f04..bd6045c8f04 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 eee324bb607..8f8c04afe54 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 bf9b5d02025..bf9b5d02025 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 a37be072140..a37be072140 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 eee324bb607..8f8c04afe54 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 d7f93026d26..d7f93026d26 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 78bf95bf0fc..78bf95bf0fc 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 eee324bb607..8f8c04afe54 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 bf428586d96..bf428586d96 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 e445763058e..e445763058e 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 eee324bb607..8f8c04afe54 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 0359b1c93ed..0359b1c93ed 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 fb65e2fbd00..fb65e2fbd00 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 eee324bb607..8f8c04afe54 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 f736770af64..f736770af64 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 9985ab21963..9985ab21963 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 eee324bb607..8f8c04afe54 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 6ca36c57428..6ca36c57428 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 c408e13ccb4..c408e13ccb4 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 eee324bb607..8f8c04afe54 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 d241a939b3a..d241a939b3a 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 d54d507f651..d54d507f651 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 eee324bb607..8f8c04afe54 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 3bd77195ea0..3bd77195ea0 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 f3a8e98bf83..f3a8e98bf83 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 eee324bb607..8f8c04afe54 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 59549a548d6..59549a548d6 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 d3bc985e62d..d3bc985e62d 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 eee324bb607..8f8c04afe54 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 fd14efe2ef1..fd14efe2ef1 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 6f4af35c966..6f4af35c966 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 eee324bb607..8f8c04afe54 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 917622b8f09..917622b8f09 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 2a0157a62cf..2a0157a62cf 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 eee324bb607..8f8c04afe54 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 6b27df3621f..6b27df3621f 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 5800982a4e0..5800982a4e0 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 eee324bb607..8f8c04afe54 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 9ce62c1052b..9ce62c1052b 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 625a126be2d..625a126be2d 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 eee324bb607..8f8c04afe54 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 558cd7da635..558cd7da635 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 c51c7840873..c51c7840873 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 eee324bb607..8f8c04afe54 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 718f92f0548..718f92f0548 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 d05da896678..d05da896678 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 eee324bb607..8f8c04afe54 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 8b4216f4a8f..8b4216f4a8f 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 10a2f7d904c..10a2f7d904c 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 eee324bb607..8f8c04afe54 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 25afe41bc35..25afe41bc35 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 bed67cb1983..bed67cb1983 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 eee324bb607..8f8c04afe54 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 4a2a055ba3c..4a2a055ba3c 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 f62554c8063..f62554c8063 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 eee324bb607..8f8c04afe54 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 cc67be7103d..cc67be7103d 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 bbac30fe01f..bbac30fe01f 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 eee324bb607..8f8c04afe54 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 873485e3dfa..873485e3dfa 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 55ea11a270c..55ea11a270c 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 eee324bb607..8f8c04afe54 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 79de1eb35bf..79de1eb35bf 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 bd7ff2f3bcd..bd7ff2f3bcd 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 eee324bb607..8f8c04afe54 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 1637ad8ecea..1637ad8ecea 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 4e0c22b3b3a..4e0c22b3b3a 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 eee324bb607..8f8c04afe54 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 dd89cb1c074..dd89cb1c074 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 c7607947d4b..c7607947d4b 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 eee324bb607..8f8c04afe54 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 8f5cba787d0..8f5cba787d0 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 cf3ba8d157c..cf3ba8d157c 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 eee324bb607..8f8c04afe54 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 5eef2a397ac..5eef2a397ac 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 140de062e26..140de062e26 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 eee324bb607..8f8c04afe54 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 b06230f45fc..b06230f45fc 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 acf83c37108..acf83c37108 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 eee324bb607..8f8c04afe54 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 e3f7a367777..e3f7a367777 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 150203b3756..150203b3756 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 eee324bb607..8f8c04afe54 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 53c7051ec60..53c7051ec60 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 edf344a5c59..edf344a5c59 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 eee324bb607..8f8c04afe54 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 00586386e82..00586386e82 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 3c44ffb3c7b..3c44ffb3c7b 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 eee324bb607..8f8c04afe54 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 94831d48f3c..94831d48f3c 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 57ef405c9b7..57ef405c9b7 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 eee324bb607..8f8c04afe54 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 f2804416846..f2804416846 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 8faa46da600..8faa46da600 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 eee324bb607..8f8c04afe54 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 10fe0240e9e..10fe0240e9e 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 c50e640d5c7..c50e640d5c7 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 eee324bb607..8f8c04afe54 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 cf479825461..cf479825461 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 0b529058530..0b529058530 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 eee324bb607..8f8c04afe54 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 17f76f5bf2e..17f76f5bf2e 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 306c46c6d05..306c46c6d05 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 eee324bb607..8f8c04afe54 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 4b909d6e21d..4b909d6e21d 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 02db43d4bfe..02db43d4bfe 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 eee324bb607..8f8c04afe54 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 29efd0a4070..29efd0a4070 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 a7dfc9839c0..a7dfc9839c0 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 eee324bb607..8f8c04afe54 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 c4aaaed9622..c4aaaed9622 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 47cc95548ea..47cc95548ea 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 eee324bb607..8f8c04afe54 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 f037fb77b3b..f037fb77b3b 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 709ef883212..709ef883212 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 eee324bb607..8f8c04afe54 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 cffbc5e45d8..cffbc5e45d8 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 bf1ec3e67ca..bf1ec3e67ca 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 eee324bb607..8f8c04afe54 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 381f98c0bb9..381f98c0bb9 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 78002d5729c..78002d5729c 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 eee324bb607..8f8c04afe54 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 53920c95fa1..53920c95fa1 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 6e1fe78e22c..6e1fe78e22c 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 eee324bb607..8f8c04afe54 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 a3dc8cba2c5..a3dc8cba2c5 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 611a4b83d7c..611a4b83d7c 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 eee324bb607..8f8c04afe54 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 660e37516a2..660e37516a2 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 c450dbc15e0..c450dbc15e0 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 eee324bb607..8f8c04afe54 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 fee6b631b29..fee6b631b29 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 30901ee6920..30901ee6920 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 eee324bb607..8f8c04afe54 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 76a8322a605..76a8322a605 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 242c4e37057..242c4e37057 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 eee324bb607..8f8c04afe54 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 5602840318c..5602840318c 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 1a95d9c13d8..1a95d9c13d8 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 eee324bb607..8f8c04afe54 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 a2ae4317b1e..a2ae4317b1e 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 017ec968c3d..017ec968c3d 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 eee324bb607..8f8c04afe54 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 06d39d1b160..06d39d1b160 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 99a1af484e7..99a1af484e7 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 eee324bb607..8f8c04afe54 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 197328427c4..197328427c4 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 af94c1e823a..af94c1e823a 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 eee324bb607..8f8c04afe54 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 d3a3f2cf37b..d3a3f2cf37b 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 1e58965269e..1e58965269e 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 eee324bb607..8f8c04afe54 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 a43bf086175..a43bf086175 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 5ec3d2b867b..5ec3d2b867b 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 eee324bb607..8f8c04afe54 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 fd9c7e5a3b0..fd9c7e5a3b0 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 a02afb44764..a02afb44764 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 eee324bb607..8f8c04afe54 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 f398910fc5c..f398910fc5c 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 a533a7288d3..a533a7288d3 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 eee324bb607..8f8c04afe54 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 e7424b3123c..e7424b3123c 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 24d1481125e..24d1481125e 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 eee324bb607..8f8c04afe54 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 facc5b0ca51..facc5b0ca51 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 64893626e22..64893626e22 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 eee324bb607..8f8c04afe54 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 1152f615029..1152f615029 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 2a7b6d732b1..2a7b6d732b1 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 eee324bb607..8f8c04afe54 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 1d47b8ab38d..1d47b8ab38d 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 72aac702c8a..72aac702c8a 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 eee324bb607..8f8c04afe54 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 ca69a6fd6bc..ca69a6fd6bc 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 10f1106fe58..10f1106fe58 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 eee324bb607..8f8c04afe54 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 75b16d33946..75b16d33946 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 e080a9db955..e080a9db955 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 eee324bb607..8f8c04afe54 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 8f1fc38295c..8f1fc38295c 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 cac79fe9e45..cac79fe9e45 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 eee324bb607..8f8c04afe54 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 69379327d8f..69379327d8f 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 55f98c96cbf..55f98c96cbf 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 eee324bb607..8f8c04afe54 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 cd392faf075..cd392faf075 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 a9a28e77887..a9a28e77887 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 eee324bb607..8f8c04afe54 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 944c9b9fff3..944c9b9fff3 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 3bd282f84d9..3bd282f84d9 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 eee324bb607..8f8c04afe54 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 d3840947c70..d3840947c70 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 58b7d747289..58b7d747289 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 eee324bb607..8f8c04afe54 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 f55b039e803..f55b039e803 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 73b14cd7cd8..73b14cd7cd8 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 eee324bb607..8f8c04afe54 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 82ba1fccb16..82ba1fccb16 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 98cdbeea4a7..98cdbeea4a7 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 eee324bb607..8f8c04afe54 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 2d48b53bc24..2d48b53bc24 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 d6dc4618e3a..d6dc4618e3a 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 eee324bb607..8f8c04afe54 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 210c5626fcf..210c5626fcf 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 36d765b6c84..36d765b6c84 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 eee324bb607..8f8c04afe54 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 833a67dafc8..833a67dafc8 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 bef89334637..bef89334637 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 eee324bb607..8f8c04afe54 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 7765f27978a..7765f27978a 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 42d399ab95b..42d399ab95b 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 eee324bb607..8f8c04afe54 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 79cb54391a4..79cb54391a4 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 b8c03c3cd72..b8c03c3cd72 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 eee324bb607..8f8c04afe54 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 cf19da8bae9..cf19da8bae9 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 b0562b9d36e..b0562b9d36e 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 eee324bb607..8f8c04afe54 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 8312dc75322..8312dc75322 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 3ae49315c77..3ae49315c77 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 eee324bb607..8f8c04afe54 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 88faa7f7f8f..88faa7f7f8f 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 1282f3c33b3..1282f3c33b3 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 eee324bb607..8f8c04afe54 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 c4de385ef49..c4de385ef49 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 3d2adfc6bf5..3d2adfc6bf5 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 eee324bb607..8f8c04afe54 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 1416bcdbe8d..1416bcdbe8d 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 aa745310f91..aa745310f91 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 eee324bb607..8f8c04afe54 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 eece0034f86..eece0034f86 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 16df0e14816..16df0e14816 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 eee324bb607..8f8c04afe54 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 799a884ec29..799a884ec29 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 a757399d4cb..a757399d4cb 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 eee324bb607..8f8c04afe54 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 1e55c4dae7a..1e55c4dae7a 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 f4765b088f3..f4765b088f3 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 eee324bb607..8f8c04afe54 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 8b7e054efac..8b7e054efac 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 acf8078ed29..acf8078ed29 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 eee324bb607..8f8c04afe54 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 4a5f6087976..4a5f6087976 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 391ef896dda..391ef896dda 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 eee324bb607..8f8c04afe54 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 001a1930e29..001a1930e29 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 babb0ef42dd..babb0ef42dd 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 eee324bb607..8f8c04afe54 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 057c70b305f..057c70b305f 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 847436e4fe6..847436e4fe6 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 eee324bb607..8f8c04afe54 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 a00d85cb7dc..a00d85cb7dc 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 1143b1cf620..1143b1cf620 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 eee324bb607..8f8c04afe54 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 4c447e0f3fb..4c447e0f3fb 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 309b68d490d..309b68d490d 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 eee324bb607..8f8c04afe54 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 a7e948070e9..a7e948070e9 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 e4ade3f8a9b..e4ade3f8a9b 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 eee324bb607..8f8c04afe54 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 f018a876e45..f018a876e45 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 ad30547f6b0..ad30547f6b0 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 eee324bb607..8f8c04afe54 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 f08cfe67556..f08cfe67556 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 e9f0680f067..e9f0680f067 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 eee324bb607..8f8c04afe54 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 3919df16d80..3919df16d80 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 14b9a1cff3f..14b9a1cff3f 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 eee324bb607..8f8c04afe54 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 ab7b86db4b6..ab7b86db4b6 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 0030fd57628..0030fd57628 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 eee324bb607..8f8c04afe54 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 970f0fd9cc8..970f0fd9cc8 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 d6a54ae5aa9..d6a54ae5aa9 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 eee324bb607..8f8c04afe54 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 e5c0bca0f4f..e5c0bca0f4f 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 1738debc181..1738debc181 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 eee324bb607..8f8c04afe54 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 706f39e0b0a..706f39e0b0a 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 4bf1d56faaf..4bf1d56faaf 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 eee324bb607..8f8c04afe54 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 e031d790368..e031d790368 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 220ba4127c7..220ba4127c7 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 eee324bb607..8f8c04afe54 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 9f5d84e6e2f..9f5d84e6e2f 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 4d176a32e74..4d176a32e74 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 eee324bb607..8f8c04afe54 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 ad203857d2d..ad203857d2d 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 937070c9abd..937070c9abd 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 eee324bb607..8f8c04afe54 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 e2643426c91..e2643426c91 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 473fb6d1337..473fb6d1337 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 eee324bb607..8f8c04afe54 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 48dcfc154a6..48dcfc154a6 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 78de9acf4d3..78de9acf4d3 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 eee324bb607..8f8c04afe54 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 699c0670006..699c0670006 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 0439fe96dac..0439fe96dac 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 eee324bb607..8f8c04afe54 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 ee3a1ec0369..ee3a1ec0369 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 4e148b509ec..4e148b509ec 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 eee324bb607..8f8c04afe54 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 3e7c2388662..3e7c2388662 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 fd65a2af024..fd65a2af024 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 eee324bb607..8f8c04afe54 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 1f963b18832..1f963b18832 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 ae8a039691b..ae8a039691b 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 eee324bb607..8f8c04afe54 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 f95ffc8013f..f95ffc8013f 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 06d27cdf770..06d27cdf770 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 eee324bb607..8f8c04afe54 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 1897f36f9d8..1897f36f9d8 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 a665c380d20..a665c380d20 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 eee324bb607..8f8c04afe54 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 7d263fa4afc..7d263fa4afc 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 89512dce037..89512dce037 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 eee324bb607..8f8c04afe54 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 2ffc82165d5..2ffc82165d5 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 7d8eb71fc95..7d8eb71fc95 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 eee324bb607..8f8c04afe54 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 e4fe0eea1fc..e4fe0eea1fc 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 f2f8b8e3e5a..f2f8b8e3e5a 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 eee324bb607..8f8c04afe54 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 363e91a78a4..363e91a78a4 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 596dc8126e4..596dc8126e4 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 eee324bb607..8f8c04afe54 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 ccb9c560eb6..ccb9c560eb6 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 bad42d9c641..bad42d9c641 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 eee324bb607..8f8c04afe54 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 04fc6c670b3..04fc6c670b3 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 7d7683eed64..7d7683eed64 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 eee324bb607..8f8c04afe54 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 6e27fb3e510..6e27fb3e510 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 10c6eaf1a01..10c6eaf1a01 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 eee324bb607..8f8c04afe54 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 9da7d84d1d3..9da7d84d1d3 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 2c36d7d9001..2c36d7d9001 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 eee324bb607..8f8c04afe54 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 1a9db7885fe..1a9db7885fe 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 110434e2b40..110434e2b40 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 eee324bb607..8f8c04afe54 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 9bdf5c7f309..9bdf5c7f309 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 c1f8a300a4b..c1f8a300a4b 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 eee324bb607..8f8c04afe54 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 ae71c871d61..ae71c871d61 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 cfc638e059c..cfc638e059c 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 eee324bb607..8f8c04afe54 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 c29128f705d..c29128f705d 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 13bdc592be9..13bdc592be9 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 eee324bb607..8f8c04afe54 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 36883adf5d5..36883adf5d5 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 5a350e05247..5a350e05247 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 eee324bb607..8f8c04afe54 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 0beae4bc4ab..0beae4bc4ab 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 21971766616..21971766616 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 eee324bb607..8f8c04afe54 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 14801237331..14801237331 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 72c65583157..72c65583157 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 eee324bb607..8f8c04afe54 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 f9107734538..f9107734538 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 e48fbd33792..e48fbd33792 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 eee324bb607..8f8c04afe54 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 06ab9bed310..06ab9bed310 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 4510bdcdcf3..4510bdcdcf3 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 eee324bb607..8f8c04afe54 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 cba9d77aefb..cba9d77aefb 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 8b6b4e286a7..8b6b4e286a7 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 eee324bb607..8f8c04afe54 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 3c32067dee8..3c32067dee8 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 d7c5719cf17..d7c5719cf17 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 eee324bb607..8f8c04afe54 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 5515e2abc24..5515e2abc24 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 ab44a00e8db..ab44a00e8db 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 eee324bb607..8f8c04afe54 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 5206231ce56..5206231ce56 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 e2c7e11c141..e2c7e11c141 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 eee324bb607..8f8c04afe54 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 9f02a9987c9..9f02a9987c9 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 90152162561..90152162561 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 eee324bb607..8f8c04afe54 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 60015599ab7..60015599ab7 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 a1e308e3a1d..a1e308e3a1d 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 eee324bb607..8f8c04afe54 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 1f35b481cd1..1f35b481cd1 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 6de65883af8..6de65883af8 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 eee324bb607..8f8c04afe54 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 9e385e935b4..9e385e935b4 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 65a44541951..65a44541951 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 eee324bb607..8f8c04afe54 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 a249a6e1a17..a249a6e1a17 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 037966adbf5..037966adbf5 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 eee324bb607..8f8c04afe54 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 48d7876096f..48d7876096f 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 883aa606d66..883aa606d66 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 eee324bb607..8f8c04afe54 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 b666858b1eb..b666858b1eb 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 76424f36c01..76424f36c01 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 eee324bb607..8f8c04afe54 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 8ef7ce0d102..8ef7ce0d102 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 e2eed687520..e2eed687520 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 eee324bb607..8f8c04afe54 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 0543dab7849..0543dab7849 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 54cfa116ae9..54cfa116ae9 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 eee324bb607..8f8c04afe54 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 f33766f5293..f33766f5293 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 84eec837620..84eec837620 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 eee324bb607..8f8c04afe54 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 68a3030fb1e..68a3030fb1e 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 8ef94e6feee..8ef94e6feee 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 eee324bb607..8f8c04afe54 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 a4432cdd5b6..a4432cdd5b6 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 eb8a2885254..eb8a2885254 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 eee324bb607..8f8c04afe54 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 f4918062cb9..f4918062cb9 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 8ad350a273b..8ad350a273b 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 eee324bb607..8f8c04afe54 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 3dfe18a5491..3dfe18a5491 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 37d9f551c45..37d9f551c45 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 eee324bb607..8f8c04afe54 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 d941f65f172..d941f65f172 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 78dacb8d18c..78dacb8d18c 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 eee324bb607..8f8c04afe54 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 4de5e571ca9..4de5e571ca9 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 5c7d360e326..5c7d360e326 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 eee324bb607..8f8c04afe54 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 174cf61a848..174cf61a848 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 7dafe42f3eb..7dafe42f3eb 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 eee324bb607..8f8c04afe54 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 cdf8c8287a3..cdf8c8287a3 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 6388557e979..6388557e979 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 eee324bb607..8f8c04afe54 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 a68ac6e3ddf..a68ac6e3ddf 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 b0ec132d0ba..b0ec132d0ba 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 eee324bb607..8f8c04afe54 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 fe923f8e304..fe923f8e304 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 ee4faf0ef51..ee4faf0ef51 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 eee324bb607..8f8c04afe54 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 c29cdc89383..c29cdc89383 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 9e74c57c6f5..9e74c57c6f5 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 eee324bb607..8f8c04afe54 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 81f9839443e..81f9839443e 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 40b13ea0e12..40b13ea0e12 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 eee324bb607..8f8c04afe54 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 7aa8d4abc8a..7aa8d4abc8a 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 7695e71e3a7..7695e71e3a7 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 eee324bb607..8f8c04afe54 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 e3570a755c7..e3570a755c7 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 1b759f03857..1b759f03857 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 eee324bb607..8f8c04afe54 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 e510cdc9d50..e510cdc9d50 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 7a798aeff2b..7a798aeff2b 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 eee324bb607..8f8c04afe54 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 1c6c5087ce9..1c6c5087ce9 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 725ca9d89fc..725ca9d89fc 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 eee324bb607..8f8c04afe54 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 ce070b006e1..ce070b006e1 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 68c0eddf13d..68c0eddf13d 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 eee324bb607..8f8c04afe54 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 f5289141cd4..f5289141cd4 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 dd04a0b7fea..dd04a0b7fea 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 eee324bb607..8f8c04afe54 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 c9503b232af..c9503b232af 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 61f6cd7a7dc..61f6cd7a7dc 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 eee324bb607..8f8c04afe54 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 5d8a3274fbd..5d8a3274fbd 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 671448c5c8f..671448c5c8f 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 eee324bb607..8f8c04afe54 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 e462538e714..e462538e714 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 1468786d3d3..1468786d3d3 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 eee324bb607..8f8c04afe54 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 59a6a3b94b8..59a6a3b94b8 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 00a580e969b..00a580e969b 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 eee324bb607..8f8c04afe54 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 6e8b3472a33..6e8b3472a33 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 22808375ff4..22808375ff4 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 eee324bb607..8f8c04afe54 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 1bf74cbc7da..1bf74cbc7da 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 255292a985f..255292a985f 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 eee324bb607..8f8c04afe54 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 fb7c7ea605e..fb7c7ea605e 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 bc81525443d..bc81525443d 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 eee324bb607..8f8c04afe54 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 e1004766987..e1004766987 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 8c9410212b8..8c9410212b8 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 eee324bb607..8f8c04afe54 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 d4e1825e473..d4e1825e473 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 b9224ec0772..b9224ec0772 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 eee324bb607..8f8c04afe54 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 a949324968f..a949324968f 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 644a5c51b9d..644a5c51b9d 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 eee324bb607..8f8c04afe54 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 c27e72485be..c27e72485be 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 061fe314687..061fe314687 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 eee324bb607..8f8c04afe54 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 0f0c9ec68f5..0f0c9ec68f5 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 0582ccf2871..0582ccf2871 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 eee324bb607..8f8c04afe54 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 c672a9e87ce..c672a9e87ce 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 51903bcbe52..51903bcbe52 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 eee324bb607..8f8c04afe54 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 55c9b505ebb..55c9b505ebb 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 0564bb23ccf..0564bb23ccf 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 eee324bb607..8f8c04afe54 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 4ddc9ac58f7..4ddc9ac58f7 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 480a565192d..480a565192d 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 eee324bb607..8f8c04afe54 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 b758a7a6e3e..b758a7a6e3e 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 c0b8db568a0..c0b8db568a0 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 eee324bb607..8f8c04afe54 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 ce51eb2c1bd..ce51eb2c1bd 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 ea3dc40c0df..ea3dc40c0df 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 eee324bb607..8f8c04afe54 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 dec2ad94f3d..dec2ad94f3d 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 ed50558bd28..ed50558bd28 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 eee324bb607..8f8c04afe54 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 0ecdac56a68..0ecdac56a68 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 c2ab77d461b..c2ab77d461b 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 eee324bb607..8f8c04afe54 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 5163645d31a..5163645d31a 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 8ebe946b96e..8ebe946b96e 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 eee324bb607..8f8c04afe54 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 57869046b7f..57869046b7f 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 09a302c238b..09a302c238b 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 eee324bb607..8f8c04afe54 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 913190e3efe..913190e3efe 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 037aa8a2ce7..037aa8a2ce7 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 eee324bb607..8f8c04afe54 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 04409453c55..04409453c55 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 973e1a080e7..973e1a080e7 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 eee324bb607..8f8c04afe54 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 bc9fe0bca4d..bc9fe0bca4d 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 f1418da3f2b..f1418da3f2b 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 eee324bb607..8f8c04afe54 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 4a55f11b0a2..4a55f11b0a2 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 50b77826716..50b77826716 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 eee324bb607..8f8c04afe54 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 c56fd192cde..c56fd192cde 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 c2d783a8ee9..c2d783a8ee9 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 eee324bb607..8f8c04afe54 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 9d401e39f38..9d401e39f38 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 a671ffdd11e..a671ffdd11e 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 eee324bb607..8f8c04afe54 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 30fe0ce8847..30fe0ce8847 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 393bb0ddb97..393bb0ddb97 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 eee324bb607..8f8c04afe54 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 ff67c37abd3..ff67c37abd3 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 2c4e9247b6e..2c4e9247b6e 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 eee324bb607..8f8c04afe54 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 0efbff16c9e..0efbff16c9e 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 26d7b260086..26d7b260086 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 eee324bb607..8f8c04afe54 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 4df1c531935..4df1c531935 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 202d2b6c932..202d2b6c932 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 eee324bb607..8f8c04afe54 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 3f598041a6b..3f598041a6b 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 84bc58ac86a..84bc58ac86a 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 eee324bb607..8f8c04afe54 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 dfdd290a09a..dfdd290a09a 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 2371b7f1d3a..2371b7f1d3a 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 eee324bb607..8f8c04afe54 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 d72b444cdd2..d72b444cdd2 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 6591381bcb1..6591381bcb1 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 eee324bb607..8f8c04afe54 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 690647f6657..690647f6657 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 8fa94bcebb5..8fa94bcebb5 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 eee324bb607..8f8c04afe54 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 b724307bffa..b724307bffa 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 8220e543f69..8220e543f69 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 eee324bb607..8f8c04afe54 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 77cfa93d6fb..77cfa93d6fb 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 a788ff2f996..a788ff2f996 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 eee324bb607..8f8c04afe54 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 78cad4b690d..78cad4b690d 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 19be752550b..19be752550b 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 eee324bb607..8f8c04afe54 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 d31762800f6..d31762800f6 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 acb70da0f4e..acb70da0f4e 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 eee324bb607..8f8c04afe54 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 3eb359e692c..3eb359e692c 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 f9d6c74b9ae..f9d6c74b9ae 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 eee324bb607..8f8c04afe54 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 b13cb101d4b..b13cb101d4b 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 9c637946ecf..9c637946ecf 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 eee324bb607..8f8c04afe54 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 033a1d63032..033a1d63032 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 6b17ab0e24b..6b17ab0e24b 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 eee324bb607..8f8c04afe54 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 8a57719e4ba..8a57719e4ba 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 80698536995..80698536995 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 eee324bb607..8f8c04afe54 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 4cb4c068666..4cb4c068666 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 baf76b49ae6..baf76b49ae6 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 eee324bb607..8f8c04afe54 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 a9edd1c8cbc..a9edd1c8cbc 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 b237839e410..b237839e410 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 eee324bb607..8f8c04afe54 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 7c5ffd8443c..7c5ffd8443c 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 daaee6f8eb6..daaee6f8eb6 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 eee324bb607..8f8c04afe54 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 47b29de8990..47b29de8990 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 a72086470b8..a72086470b8 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 eee324bb607..8f8c04afe54 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 83e00005d91..83e00005d91 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 98d46fa5585..98d46fa5585 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 eee324bb607..8f8c04afe54 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 12af9831d3e..12af9831d3e 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 4a41f6fbd74..4a41f6fbd74 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 eee324bb607..8f8c04afe54 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 6ba6b1950c2..6ba6b1950c2 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 40517926433..40517926433 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 eee324bb607..8f8c04afe54 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 ab954781bb1..ab954781bb1 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 4d6f5b7d99b..4d6f5b7d99b 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 eee324bb607..8f8c04afe54 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 b2643e5ddb9..b2643e5ddb9 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 38ed49a1302..38ed49a1302 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 eee324bb607..8f8c04afe54 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 72b423bf047..72b423bf047 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 93674c94e2b..93674c94e2b 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 eee324bb607..8f8c04afe54 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 5e444894110..5e444894110 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 f9cc3fc6229..f9cc3fc6229 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 eee324bb607..8f8c04afe54 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 f98c503992b..f98c503992b 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 6f22c933f45..6f22c933f45 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 eee324bb607..8f8c04afe54 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 d7b029f4177..d7b029f4177 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 882d7f985ef..882d7f985ef 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 eee324bb607..8f8c04afe54 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 6721cb25bec..6721cb25bec 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 3481f5a84b0..3481f5a84b0 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 eee324bb607..8f8c04afe54 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 db31ad4641c..db31ad4641c 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 f5e2d235414..f5e2d235414 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 eee324bb607..8f8c04afe54 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 57652360b90..57652360b90 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 a102b69d765..a102b69d765 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 eee324bb607..8f8c04afe54 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 fd516913ac6..fd516913ac6 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 8452c94f2c0..8452c94f2c0 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 eee324bb607..8f8c04afe54 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 b70b20404b7..b70b20404b7 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 b654db1b448..b654db1b448 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 eee324bb607..8f8c04afe54 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 dd91674fcbf..dd91674fcbf 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 a700206bd1d..a700206bd1d 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 eee324bb607..8f8c04afe54 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 3601589d096..3601589d096 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 2552e0ff508..2552e0ff508 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 eee324bb607..8f8c04afe54 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 cab50904fd5..cab50904fd5 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 5e702794935..5e702794935 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 eee324bb607..8f8c04afe54 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 c60bb0dd917..c60bb0dd917 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 aa8b0faf5eb..aa8b0faf5eb 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 eee324bb607..8f8c04afe54 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 4b08fc0283c..4b08fc0283c 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 f2ac5fd618d..f2ac5fd618d 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 eee324bb607..8f8c04afe54 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 9cf06ee67b1..9cf06ee67b1 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 38d5d642b6b..38d5d642b6b 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 eee324bb607..8f8c04afe54 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 d07ec523871..d07ec523871 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 fe4dc072390..fe4dc072390 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 eee324bb607..8f8c04afe54 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 e30ea236e4c..e30ea236e4c 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 7d2fbd94055..7d2fbd94055 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 eee324bb607..8f8c04afe54 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 054f1eabe45..054f1eabe45 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 9e53bc84666..9e53bc84666 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 eee324bb607..8f8c04afe54 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 19c781ba2e1..19c781ba2e1 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 08897dcd77c..08897dcd77c 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 eee324bb607..8f8c04afe54 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 df9580cfabc..df9580cfabc 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 093b85ebe80..093b85ebe80 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 eee324bb607..8f8c04afe54 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 159e7704496..159e7704496 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 4fd8c274065..4fd8c274065 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 eee324bb607..8f8c04afe54 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 bc3c30c5944..bc3c30c5944 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 49bc2805a85..49bc2805a85 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 eee324bb607..8f8c04afe54 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 d59b7bbb003..d59b7bbb003 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 fabf0bf59e1..fabf0bf59e1 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 eee324bb607..8f8c04afe54 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 bf765f4fca7..bf765f4fca7 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 786900b59f2..786900b59f2 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 eee324bb607..8f8c04afe54 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 5a106aefdf3..5a106aefdf3 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 b3131ff95c1..b3131ff95c1 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 eee324bb607..8f8c04afe54 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 1684560b585..1684560b585 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 93f30cd5d26..93f30cd5d26 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 eee324bb607..8f8c04afe54 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 2d15ad7a0d0..2d15ad7a0d0 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 ed98c383808..ed98c383808 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 eee324bb607..8f8c04afe54 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 7ca05080706..7ca05080706 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 6added46c76..6added46c76 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 eee324bb607..8f8c04afe54 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 231a6222ba4..231a6222ba4 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 8cf634be3a6..8cf634be3a6 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 eee324bb607..8f8c04afe54 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 8bcc3d83ccc..8bcc3d83ccc 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 95fda6e9ab6..95fda6e9ab6 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 eee324bb607..8f8c04afe54 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 738ae152498..738ae152498 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 842c735662b..842c735662b 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 eee324bb607..8f8c04afe54 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 b3fa682d724..b3fa682d724 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 e15b0052401..e15b0052401 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 eee324bb607..8f8c04afe54 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 6c8ae852b49..6c8ae852b49 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 d9c7f453595..d9c7f453595 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 eee324bb607..8f8c04afe54 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 9928b65a1d7..9928b65a1d7 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 c7fe09bce36..c7fe09bce36 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 eee324bb607..8f8c04afe54 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 12f90e43436..12f90e43436 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 1f7a5e6cc2e..1f7a5e6cc2e 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 eee324bb607..8f8c04afe54 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 a6724661ab1..a6724661ab1 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 de9be9b8a7e..de9be9b8a7e 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 eee324bb607..8f8c04afe54 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 0caae2bb8bc..0caae2bb8bc 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 913a19d70dd..913a19d70dd 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 eee324bb607..8f8c04afe54 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 af59dcbdc23..af59dcbdc23 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 d630385828a..d630385828a 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 eee324bb607..8f8c04afe54 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 85d6760e331..85d6760e331 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 4af0a226f37..4af0a226f37 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 eee324bb607..8f8c04afe54 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 cb46f19a8eb..cb46f19a8eb 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 64a21db00c5..64a21db00c5 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 eee324bb607..8f8c04afe54 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 091980d2217..091980d2217 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 1c49b0706c6..1c49b0706c6 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 eee324bb607..8f8c04afe54 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 d020ddf06c5..d020ddf06c5 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 ad19c4a9534..ad19c4a9534 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 eee324bb607..8f8c04afe54 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 7163ea30261..7163ea30261 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 e0561f49ac1..e0561f49ac1 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 eee324bb607..8f8c04afe54 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 c109f459442..c109f459442 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 62aa881caf6..62aa881caf6 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 eee324bb607..8f8c04afe54 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 da63192d6c4..da63192d6c4 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 e2bdaf35ddc..e2bdaf35ddc 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 eee324bb607..8f8c04afe54 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 b3c55f85535..b3c55f85535 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 eb29e3f22b1..eb29e3f22b1 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 eee324bb607..8f8c04afe54 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 c7db79695c8..c7db79695c8 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 33245d1cde7..33245d1cde7 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 eee324bb607..8f8c04afe54 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 ddaaf42002d..ddaaf42002d 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 4acc1d5e5e1..4acc1d5e5e1 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 eee324bb607..8f8c04afe54 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 7b63f5201eb..7b63f5201eb 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 6b9d4a0b9a2..6b9d4a0b9a2 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 eee324bb607..8f8c04afe54 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 c97d40d7964..c97d40d7964 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 87b72da6cc8..87b72da6cc8 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 eee324bb607..8f8c04afe54 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 5be1241c6fc..5be1241c6fc 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 da8e31b84dc..da8e31b84dc 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 eee324bb607..8f8c04afe54 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 4f2873013c0..4f2873013c0 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 aee95c3fc06..aee95c3fc06 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 eee324bb607..8f8c04afe54 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 d2c77f18827..d2c77f18827 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 8cc82f3fe69..8cc82f3fe69 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 eee324bb607..8f8c04afe54 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 4254e9dfc21..4254e9dfc21 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 3a96172efe8..3a96172efe8 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 eee324bb607..8f8c04afe54 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 2e4fd4c015e..2e4fd4c015e 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 9de2776b61f..9de2776b61f 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 eee324bb607..8f8c04afe54 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 9ff690e7590..9ff690e7590 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 a363ba10cbf..a363ba10cbf 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 eee324bb607..8f8c04afe54 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 dbf7721d31a..dbf7721d31a 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 acf36fb18d9..acf36fb18d9 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 eee324bb607..8f8c04afe54 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 c335dad443a..c335dad443a 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 1af4e0ce617..1af4e0ce617 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 eee324bb607..8f8c04afe54 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 be300eb773d..be300eb773d 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 4465d0df850..4465d0df850 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 eee324bb607..8f8c04afe54 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 dbe5e40a62f..dbe5e40a62f 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 258716a28e7..258716a28e7 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 eee324bb607..8f8c04afe54 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 06644053cb2..06644053cb2 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 be0f67f9af5..be0f67f9af5 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 eee324bb607..8f8c04afe54 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 c68be3d9d73..c68be3d9d73 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 f4eea50f900..f4eea50f900 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 eee324bb607..8f8c04afe54 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 5c3b002469c..5c3b002469c 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 c7e952c5e9e..c7e952c5e9e 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 eee324bb607..8f8c04afe54 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 1460969835f..1460969835f 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 33ddf79d6a8..33ddf79d6a8 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 eee324bb607..8f8c04afe54 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 bd1a6143466..bd1a6143466 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 c2d919d16ae..c2d919d16ae 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 eee324bb607..8f8c04afe54 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 f146c6a7fa7..f146c6a7fa7 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 9417e91f65c..9417e91f65c 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 eee324bb607..8f8c04afe54 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 c98b5373f8c..c98b5373f8c 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 b0e3c06141b..b0e3c06141b 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 eee324bb607..8f8c04afe54 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 97842797313..97842797313 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 e37fff10493..e37fff10493 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 eee324bb607..8f8c04afe54 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 5875991b229..5875991b229 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 f9f19aeb55e..f9f19aeb55e 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 eee324bb607..8f8c04afe54 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 e6994fdc3d8..e6994fdc3d8 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 80890922917..80890922917 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 eee324bb607..8f8c04afe54 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 544e1733598..544e1733598 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 ffa5253d326..ffa5253d326 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 eee324bb607..8f8c04afe54 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 94f7c1ddcc8..94f7c1ddcc8 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 e2a6f310477..e2a6f310477 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 eee324bb607..8f8c04afe54 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 cde3f254d67..cde3f254d67 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 bd9cfc5092b..bd9cfc5092b 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 eee324bb607..8f8c04afe54 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 d150a97277c..d150a97277c 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 b0bce7c0b13..b0bce7c0b13 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 eee324bb607..8f8c04afe54 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 f17c977e58e..f17c977e58e 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 20922df5d19..20922df5d19 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 eee324bb607..8f8c04afe54 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 194012b114e..194012b114e 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 49df2e31fe2..49df2e31fe2 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 eee324bb607..8f8c04afe54 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 933946e04b1..933946e04b1 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 6e4bcea5019..6e4bcea5019 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 eee324bb607..8f8c04afe54 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 ac3e5213ccc..ac3e5213ccc 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 6473a843b3c..6473a843b3c 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 eee324bb607..8f8c04afe54 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 663f18cb5cc..663f18cb5cc 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 861c5ef59ce..861c5ef59ce 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 eee324bb607..8f8c04afe54 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 39d143125e9..39d143125e9 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 5cc9efba148..5cc9efba148 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 eee324bb607..8f8c04afe54 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 c6a5eead085..c6a5eead085 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 e0b9264f902..e0b9264f902 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 eee324bb607..8f8c04afe54 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 2243665db15..2243665db15 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 56605eb5b02..56605eb5b02 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 eee324bb607..8f8c04afe54 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 0433916a530..0433916a530 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 6b72b52fbde..6b72b52fbde 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 eee324bb607..8f8c04afe54 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 d3e0c08314e..d3e0c08314e 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 ad785f3b1ad..ad785f3b1ad 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 eee324bb607..8f8c04afe54 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 69e49753220..69e49753220 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 cb0c00744da..cb0c00744da 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 eee324bb607..8f8c04afe54 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 1550f58697e..1550f58697e 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 46c16ebd0a0..46c16ebd0a0 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 eee324bb607..8f8c04afe54 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 ba3d5bf4033..ba3d5bf4033 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 c5ac563d94a..c5ac563d94a 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 eee324bb607..8f8c04afe54 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 139168c1d95..139168c1d95 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 c05242a04cd..c05242a04cd 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 eee324bb607..8f8c04afe54 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 e03a23eecb3..e03a23eecb3 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 0d3ba30fb44..0d3ba30fb44 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 eee324bb607..8f8c04afe54 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 e1c897575b8..e1c897575b8 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 e684473f198..e684473f198 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 eee324bb607..8f8c04afe54 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 bdc398d4594..bdc398d4594 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 ca1957493cc..ca1957493cc 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 eee324bb607..8f8c04afe54 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 ca07f5769ca..ca07f5769ca 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 64553751b6c..64553751b6c 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 eee324bb607..8f8c04afe54 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 a5f8f139cee..a5f8f139cee 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 4a21994fc47..4a21994fc47 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 eee324bb607..8f8c04afe54 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 4922a828127..4922a828127 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 ed89dbf66fe..ed89dbf66fe 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 eee324bb607..8f8c04afe54 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 49d13480986..49d13480986 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 56b5c7eccd0..56b5c7eccd0 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 eee324bb607..8f8c04afe54 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 7ad8a52d897..7ad8a52d897 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 971db83d17c..971db83d17c 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 eee324bb607..8f8c04afe54 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 e1b5ab26c6b..e1b5ab26c6b 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 bb13308f8f7..bb13308f8f7 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 eee324bb607..8f8c04afe54 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 ea0e549fb1f..ea0e549fb1f 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 b3c558259dc..b3c558259dc 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 eee324bb607..8f8c04afe54 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 64537374ca7..64537374ca7 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 1d075cc42a4..1d075cc42a4 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 eee324bb607..8f8c04afe54 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 1626b4cb8fa..1626b4cb8fa 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 67154f4f014..67154f4f014 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 eee324bb607..8f8c04afe54 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 5ef82db9e3c..5ef82db9e3c 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 a1ccc3177e9..a1ccc3177e9 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 eee324bb607..8f8c04afe54 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 cdda2b3ff32..cdda2b3ff32 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 5f3e23f6f0a..5f3e23f6f0a 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 eee324bb607..8f8c04afe54 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 386b8b3251f..386b8b3251f 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 6d9e3c1420f..6d9e3c1420f 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 eee324bb607..8f8c04afe54 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 0ca322f3c29..0ca322f3c29 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 c99c5935b35..c99c5935b35 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 eee324bb607..8f8c04afe54 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 1bc21f5a2de..1bc21f5a2de 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 6f204524e09..6f204524e09 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 eee324bb607..8f8c04afe54 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 2954dbc509e..2954dbc509e 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 c6f97efc7c8..c6f97efc7c8 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 eee324bb607..8f8c04afe54 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 8b6368ebf59..8b6368ebf59 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 ace82c7d4e6..ace82c7d4e6 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 eee324bb607..8f8c04afe54 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 a4e86e30e0e..a4e86e30e0e 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 005c55de979..005c55de979 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 eee324bb607..8f8c04afe54 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 60ba7bb876a..60ba7bb876a 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 cf38906da1f..cf38906da1f 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 eee324bb607..8f8c04afe54 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 7d2b183979f..7d2b183979f 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 3192cd8d4c3..3192cd8d4c3 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 eee324bb607..8f8c04afe54 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 8b5aad8c8aa..8b5aad8c8aa 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 a2809993838..a2809993838 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 eee324bb607..8f8c04afe54 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 c1d1a3c30a4..c1d1a3c30a4 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 d795eea3ab6..d795eea3ab6 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 eee324bb607..8f8c04afe54 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 75ea783ac81..75ea783ac81 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 552e015705c..552e015705c 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 eee324bb607..8f8c04afe54 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 014ee1370fd..014ee1370fd 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 55f5c5f3f8d..55f5c5f3f8d 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 eee324bb607..8f8c04afe54 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 913877e6fd9..913877e6fd9 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 55cf7f014f8..55cf7f014f8 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 eee324bb607..8f8c04afe54 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 3a5a1723ba0..3a5a1723ba0 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 a37b3adfeeb..a37b3adfeeb 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 eee324bb607..8f8c04afe54 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 71322b69cca..71322b69cca 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 1eb240fd7bf..1eb240fd7bf 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 eee324bb607..8f8c04afe54 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 c2a284076f8..c2a284076f8 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 d233360f6a1..d233360f6a1 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 eee324bb607..8f8c04afe54 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 336127fc268..336127fc268 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 148291a94bf..148291a94bf 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 eee324bb607..8f8c04afe54 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 d23f61eba43..d23f61eba43 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 361dd690071..361dd690071 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 eee324bb607..8f8c04afe54 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 ecd2ce5e72c..ecd2ce5e72c 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 cdcc7c5282d..cdcc7c5282d 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 eee324bb607..8f8c04afe54 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 ad256049c8c..ad256049c8c 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 7da75a07c36..7da75a07c36 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 eee324bb607..8f8c04afe54 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 e8a9737df7a..e8a9737df7a 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 a4ca991d195..a4ca991d195 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 eee324bb607..8f8c04afe54 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 6b5b8c46f18..6b5b8c46f18 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 4d1b5eb3826..4d1b5eb3826 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 eee324bb607..8f8c04afe54 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 503612c355a..503612c355a 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 8198399840b..8198399840b 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 eee324bb607..8f8c04afe54 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 7c3aa4b9af7..7c3aa4b9af7 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 1bf619469a5..1bf619469a5 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 eee324bb607..8f8c04afe54 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 a6a7cff53e9..a6a7cff53e9 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 a6f80d3e717..a6f80d3e717 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 eee324bb607..8f8c04afe54 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 2ae5373c873..2ae5373c873 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 c789f051e22..c789f051e22 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 eee324bb607..8f8c04afe54 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 92a7c7975d9..92a7c7975d9 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 4c16eb983ec..4c16eb983ec 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 eee324bb607..8f8c04afe54 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 7c356980146..7c356980146 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 b92b02ab735..b92b02ab735 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 eee324bb607..8f8c04afe54 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 59ac075d367..59ac075d367 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 7c1f6b8f86e..7c1f6b8f86e 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 eee324bb607..8f8c04afe54 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 9715128f467..9715128f467 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 031651c0400..031651c0400 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 eee324bb607..8f8c04afe54 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 6de7fc97e73..6de7fc97e73 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 596c5913b10..596c5913b10 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 eee324bb607..8f8c04afe54 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 b27a2ed4f79..b27a2ed4f79 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 d3afcddab93..d3afcddab93 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 eee324bb607..8f8c04afe54 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 8eba3e9ddc6..8eba3e9ddc6 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 fe445ed4861..fe445ed4861 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 eee324bb607..8f8c04afe54 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 3113f500f09..3113f500f09 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 405bf5afe1c..405bf5afe1c 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 eee324bb607..8f8c04afe54 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 bf310baa0d8..bf310baa0d8 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 974ec7f398b..974ec7f398b 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 eee324bb607..8f8c04afe54 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 427fe81796f..427fe81796f 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 bfbb6d839e8..bfbb6d839e8 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 eee324bb607..8f8c04afe54 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 bd40178fc1e..bd40178fc1e 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 9b7472b986a..9b7472b986a 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 eee324bb607..8f8c04afe54 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 ff67e932651..ff67e932651 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 b3a387d8fc9..b3a387d8fc9 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 eee324bb607..8f8c04afe54 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 7dff6bb212c..7dff6bb212c 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 c5df04493b6..c5df04493b6 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 eee324bb607..8f8c04afe54 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 b31069c69be..b31069c69be 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 cac54232822..cac54232822 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 eee324bb607..8f8c04afe54 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 ae35a96ed57..ae35a96ed57 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 ba7d1f19a91..ba7d1f19a91 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 eee324bb607..8f8c04afe54 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 54c8c9ac1c8..54c8c9ac1c8 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 35d9f20e49a..35d9f20e49a 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 eee324bb607..8f8c04afe54 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 102a906f0cf..102a906f0cf 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 b16ca53920c..b16ca53920c 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 eee324bb607..8f8c04afe54 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 d9b859367bc..d9b859367bc 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 e9f65247d28..e9f65247d28 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 eee324bb607..8f8c04afe54 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 bf877d4c78c..bf877d4c78c 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 066ed1ab3a3..066ed1ab3a3 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 eee324bb607..8f8c04afe54 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 7218378b8b5..7218378b8b5 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 b7984d89be3..b7984d89be3 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 eee324bb607..8f8c04afe54 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 100a360532a..100a360532a 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 ffe27cc8f9d..ffe27cc8f9d 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 eee324bb607..8f8c04afe54 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 68671e8b396..68671e8b396 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 4ba81eed8a3..4ba81eed8a3 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 eee324bb607..8f8c04afe54 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 64eb88ec04b..64eb88ec04b 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 3a69c1f2d09..3a69c1f2d09 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 eee324bb607..8f8c04afe54 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 6e37268a1ff..6e37268a1ff 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 aa8aaa3ccb4..aa8aaa3ccb4 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 eee324bb607..8f8c04afe54 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 f3fd1057c3f..f3fd1057c3f 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 fa07869250c..fa07869250c 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 eee324bb607..8f8c04afe54 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 0223b09882f..0223b09882f 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 4593b225cd4..4593b225cd4 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 eee324bb607..8f8c04afe54 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 741986c8611..741986c8611 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 812cc926211..812cc926211 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 eee324bb607..8f8c04afe54 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 ffdbd27beca..ffdbd27beca 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 725db4dd9a8..725db4dd9a8 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 eee324bb607..8f8c04afe54 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 e272674974e..e272674974e 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 49840f54b89..49840f54b89 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 eee324bb607..8f8c04afe54 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 02f21933a90..02f21933a90 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 9b03ab9bc57..9b03ab9bc57 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 eee324bb607..8f8c04afe54 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 3cfa9f24f70..3cfa9f24f70 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 6071fc49022..6071fc49022 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 eee324bb607..8f8c04afe54 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 b53684c776d..b53684c776d 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 337eb74e3b1..337eb74e3b1 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 eee324bb607..8f8c04afe54 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 225ea55cc3b..225ea55cc3b 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 2f65a3a9376..2f65a3a9376 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 eee324bb607..8f8c04afe54 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 b6e8e1156ad..b6e8e1156ad 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 851cc422681..851cc422681 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 eee324bb607..8f8c04afe54 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 0d9b3abdd2d..0d9b3abdd2d 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 a1bba8a837c..a1bba8a837c 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 eee324bb607..8f8c04afe54 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 6928b078092..6928b078092 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 c216b8801e7..c216b8801e7 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 eee324bb607..8f8c04afe54 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 6819133278a..6819133278a 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 4d1c6ede163..4d1c6ede163 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 eee324bb607..8f8c04afe54 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 ea224594c08..ea224594c08 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 69d832ded0c..69d832ded0c 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 eee324bb607..8f8c04afe54 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 25872ed43bd..25872ed43bd 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 de0b597067b..de0b597067b 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 eee324bb607..8f8c04afe54 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 baa8fceadb5..baa8fceadb5 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 72e1682b662..72e1682b662 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 0f8cf0fb161..a603bef54ed 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 118580ff4cf..118580ff4cf 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 0bfb5e56844..0bfb5e56844 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 eee324bb607..8f8c04afe54 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 a021b4859b9..a021b4859b9 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 6763195f0d3..6763195f0d3 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 eee324bb607..8f8c04afe54 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 35b5487e79e..35b5487e79e 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 4ce9056fc0e..4ce9056fc0e 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 eee324bb607..8f8c04afe54 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 f0f4699c55c..f0f4699c55c 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 a740b644572..a740b644572 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 eee324bb607..8f8c04afe54 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 382b5085cd3..382b5085cd3 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 5f442af9f2c..5f442af9f2c 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 eee324bb607..8f8c04afe54 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 d722e0e4663..d722e0e4663 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 2c8b78a7484..2c8b78a7484 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 eee324bb607..8f8c04afe54 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 0369922dd07..0369922dd07 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 f5b55e898b4..f5b55e898b4 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 eee324bb607..8f8c04afe54 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 064ae015db5..064ae015db5 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 8ebaa5c9112..8ebaa5c9112 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 eee324bb607..8f8c04afe54 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 357d4c0baf1..357d4c0baf1 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 ef987e0506a..ef987e0506a 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 eee324bb607..8f8c04afe54 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 8e9addba135..8e9addba135 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 0523a3a5a8e..0523a3a5a8e 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 eee324bb607..8f8c04afe54 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 007223c328d..007223c328d 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 ef80cbd3ea6..ef80cbd3ea6 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 eee324bb607..8f8c04afe54 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 9ab206f7859..9ab206f7859 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 cf733641cc9..cf733641cc9 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 eee324bb607..8f8c04afe54 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 f4ef52b638a..f4ef52b638a 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 91952ef4ad6..91952ef4ad6 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 eee324bb607..8f8c04afe54 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 ccf8716a478..ccf8716a478 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 515cb8471d8..515cb8471d8 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 eee324bb607..8f8c04afe54 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 70ee437a1e2..70ee437a1e2 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 bcf6139d202..bcf6139d202 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 eee324bb607..8f8c04afe54 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 a4a971ab596..a4a971ab596 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 a8a67fdae4f..a8a67fdae4f 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 eee324bb607..8f8c04afe54 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 6f9f52f430e..6f9f52f430e 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 963c3eb2484..963c3eb2484 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 eee324bb607..8f8c04afe54 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 56baf081bb4..56baf081bb4 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 09fed5adf97..09fed5adf97 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 eee324bb607..8f8c04afe54 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 948585439c0..948585439c0 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 ca62ddeed51..ca62ddeed51 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 eee324bb607..8f8c04afe54 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 aea1570e3f0..aea1570e3f0 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 92b839a424d..92b839a424d 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 eee324bb607..8f8c04afe54 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 a05d4db5370..a05d4db5370 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 9a111311461..9a111311461 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 eee324bb607..8f8c04afe54 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 930273011ab..930273011ab 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 d3c4ab6ba62..d3c4ab6ba62 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 eee324bb607..8f8c04afe54 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 25fc6c5b42e..25fc6c5b42e 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 6c791e84d17..6c791e84d17 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 eee324bb607..8f8c04afe54 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 e8073842db8..e8073842db8 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 cca3dc9ca0e..cca3dc9ca0e 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 eee324bb607..8f8c04afe54 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 b250700c13e..b250700c13e 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 4965fbd1af2..4965fbd1af2 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 eee324bb607..8f8c04afe54 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 daae4e243b1..daae4e243b1 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 ffc60ee1993..ffc60ee1993 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 eee324bb607..8f8c04afe54 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 309e84a6e4b..309e84a6e4b 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 84c9994fd8d..84c9994fd8d 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 eee324bb607..8f8c04afe54 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 bc3eca545a3..bc3eca545a3 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 35d9e8b6f7e..35d9e8b6f7e 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 eee324bb607..8f8c04afe54 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 5c9782c75c8..5c9782c75c8 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 a765a3170f6..a765a3170f6 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 eee324bb607..8f8c04afe54 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 43e5158e791..43e5158e791 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 5838e737ef4..5838e737ef4 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 eee324bb607..8f8c04afe54 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 cc364257b13..cc364257b13 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 cdbd4f403da..cdbd4f403da 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 eee324bb607..8f8c04afe54 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 5d57ad086b2..5d57ad086b2 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 e9633e8f379..e9633e8f379 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 eee324bb607..8f8c04afe54 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 132297fce49..132297fce49 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 f5858e8c2c8..f5858e8c2c8 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 eee324bb607..8f8c04afe54 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 574c5b1c75e..574c5b1c75e 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 479f52e981d..479f52e981d 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 eee324bb607..8f8c04afe54 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 be8470792ee..be8470792ee 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 04952d1140f..04952d1140f 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 eee324bb607..8f8c04afe54 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 3787f95f28b..3787f95f28b 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 a36c440c4f6..a36c440c4f6 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 eee324bb607..8f8c04afe54 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 914fca536f7..914fca536f7 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 68bd56be504..68bd56be504 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 eee324bb607..8f8c04afe54 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 a162bb7e14c..a162bb7e14c 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 bc86b2fc123..bc86b2fc123 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 eee324bb607..8f8c04afe54 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 2f9785282f0..2f9785282f0 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 b93e2f129a5..b93e2f129a5 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 eee324bb607..8f8c04afe54 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 fe6f62f9784..fe6f62f9784 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 fb7652b6239..fb7652b6239 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 eee324bb607..8f8c04afe54 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 5f3635f3722..5f3635f3722 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 baa6e9014e0..baa6e9014e0 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 eee324bb607..8f8c04afe54 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 1cc572225f4..1cc572225f4 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 77f8a56e52d..77f8a56e52d 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 eee324bb607..8f8c04afe54 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 8b0bff17df6..8b0bff17df6 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 0555f3e54ec..0555f3e54ec 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 eee324bb607..8f8c04afe54 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 fa54b0a08b3..fa54b0a08b3 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 1bbb34cbc46..1bbb34cbc46 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 eee324bb607..8f8c04afe54 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 f3d30a1dc4a..f3d30a1dc4a 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 40977337e70..40977337e70 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 eee324bb607..8f8c04afe54 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 21c6fedd14b..21c6fedd14b 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 83a9cd73e84..83a9cd73e84 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 eee324bb607..8f8c04afe54 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 6c1a4cb9ee1..6c1a4cb9ee1 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 e4181a03332..e4181a03332 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 eee324bb607..8f8c04afe54 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 fa886f3f5f5..fa886f3f5f5 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 20e6920d030..20e6920d030 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 eee324bb607..8f8c04afe54 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 061ae0bfad7..061ae0bfad7 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 98b594944f1..98b594944f1 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 eee324bb607..8f8c04afe54 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 1747265baea..1747265baea 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 af14a849262..af14a849262 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 eee324bb607..8f8c04afe54 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 b318ad03406..b318ad03406 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 9e1ea7a9fca..9e1ea7a9fca 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 eee324bb607..8f8c04afe54 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 1054789c723..1054789c723 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 3a50ae828dc..3a50ae828dc 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 eee324bb607..8f8c04afe54 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 d2723d4773d..d2723d4773d 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 c73567f56e9..c73567f56e9 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 eee324bb607..8f8c04afe54 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 70619e91948..70619e91948 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 6597ed45047..6597ed45047 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 eee324bb607..8f8c04afe54 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 85bc6ce671d..85bc6ce671d 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 8c5248faa47..8c5248faa47 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 eee324bb607..8f8c04afe54 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 7f999328815..7f999328815 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 f53158a505a..f53158a505a 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 eee324bb607..8f8c04afe54 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 d81b9b9d690..d81b9b9d690 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 2f618c2bd20..2f618c2bd20 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 eee324bb607..8f8c04afe54 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 2213c8b415d..2213c8b415d 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 f01517462e7..f01517462e7 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 eee324bb607..8f8c04afe54 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 cafad8055c2..cafad8055c2 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 24f0a054524..24f0a054524 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 eee324bb607..8f8c04afe54 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 c729a2f2e1c..c729a2f2e1c 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 9271a730d46..9271a730d46 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 eee324bb607..8f8c04afe54 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 26eb430d3da..26eb430d3da 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 32c5c7d3f64..32c5c7d3f64 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 eee324bb607..8f8c04afe54 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 832cd654ae6..832cd654ae6 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 44a41a06db8..44a41a06db8 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 eee324bb607..8f8c04afe54 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 2e71f1e95ae..2e71f1e95ae 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 bf10f0d8006..bf10f0d8006 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 eee324bb607..8f8c04afe54 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 47acf416674..47acf416674 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 ef207c4656b..ef207c4656b 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 eee324bb607..8f8c04afe54 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 25eb12ebaaf..25eb12ebaaf 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 dd1ee4a7fc0..dd1ee4a7fc0 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 eee324bb607..8f8c04afe54 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 0e247f5b01a..0e247f5b01a 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 55c309997bd..55c309997bd 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 eee324bb607..8f8c04afe54 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 315e0182258..315e0182258 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 ff643b33cfb..ff643b33cfb 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 eee324bb607..8f8c04afe54 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 6516783acbf..6516783acbf 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 acab33a299a..acab33a299a 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 eee324bb607..8f8c04afe54 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 fd57dace96c..fd57dace96c 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 0a61593707e..0a61593707e 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 eee324bb607..8f8c04afe54 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 5bb17a45a42..5bb17a45a42 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 73213515674..73213515674 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 eee324bb607..8f8c04afe54 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 b897abcb4f2..b897abcb4f2 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 87b6a845da4..87b6a845da4 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 eee324bb607..8f8c04afe54 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 cf7af4749a9..cf7af4749a9 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 49938a8c462..49938a8c462 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 eee324bb607..8f8c04afe54 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 52aec2119d7..52aec2119d7 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 5819bbc6d33..5819bbc6d33 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 eee324bb607..8f8c04afe54 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 dc5f3b95ff7..dc5f3b95ff7 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 584d25a4ff9..584d25a4ff9 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 eee324bb607..8f8c04afe54 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 4bbd8d7f7f4..4bbd8d7f7f4 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 fd222e83589..fd222e83589 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 eee324bb607..8f8c04afe54 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 4d9af8a9e92..4d9af8a9e92 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 5d15504310f..5d15504310f 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 eee324bb607..8f8c04afe54 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 4bedc84e58e..4bedc84e58e 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 505826459af..505826459af 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 eee324bb607..8f8c04afe54 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 5609a579c18..5609a579c18 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 e937c715659..e937c715659 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 eee324bb607..8f8c04afe54 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 09cef241416..09cef241416 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 3ebb3572b82..3ebb3572b82 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 eee324bb607..8f8c04afe54 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 fbc86c388ee..fbc86c388ee 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 c0a44cd2126..c0a44cd2126 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 eee324bb607..8f8c04afe54 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 19060c7bc30..19060c7bc30 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 8cec7064511..8cec7064511 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 eee324bb607..8f8c04afe54 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 512e840d1a8..512e840d1a8 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 48ec6d8d713..48ec6d8d713 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 eee324bb607..8f8c04afe54 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 e29b663bed7..e29b663bed7 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 447302f9bad..447302f9bad 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 eee324bb607..8f8c04afe54 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 f9708502339..f9708502339 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 d4560b19c2f..d4560b19c2f 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 eee324bb607..8f8c04afe54 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 74f4feaa44d..74f4feaa44d 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 f7c15a5f3d6..f7c15a5f3d6 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 eee324bb607..8f8c04afe54 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 89fc8b0b018..89fc8b0b018 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 040e95b049d..040e95b049d 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 eee324bb607..8f8c04afe54 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 79ad7b12947..79ad7b12947 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 1869d8b27c6..1869d8b27c6 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 eee324bb607..8f8c04afe54 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 033098798aa..033098798aa 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 a662e4640f8..a662e4640f8 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 eee324bb607..8f8c04afe54 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 3c370906153..3c370906153 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 c155bce5d44..c155bce5d44 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 eee324bb607..8f8c04afe54 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 f43f55d0d85..f43f55d0d85 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 a0109f09e98..a0109f09e98 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 eee324bb607..8f8c04afe54 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 39f80d898a9..39f80d898a9 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 34d54d3014f..34d54d3014f 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 eee324bb607..8f8c04afe54 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 5e380bcbebe..5e380bcbebe 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 4abc4953e5a..4abc4953e5a 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 eee324bb607..8f8c04afe54 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 aec64b880e2..aec64b880e2 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 9eb92dd630f..9eb92dd630f 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 eee324bb607..8f8c04afe54 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 a818d5398bf..a818d5398bf 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 05d0648d817..05d0648d817 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 eee324bb607..8f8c04afe54 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 65d2f12e2ac..65d2f12e2ac 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 9b5df75f591..9b5df75f591 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 eee324bb607..8f8c04afe54 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 e46562c7d87..e46562c7d87 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 906f81b5e4e..906f81b5e4e 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 eee324bb607..8f8c04afe54 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 02b893de3bd..02b893de3bd 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 d1fd41654f5..d1fd41654f5 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 eee324bb607..8f8c04afe54 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 7ce8f04bcfa..7ce8f04bcfa 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 b0255d7b59c..b0255d7b59c 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 eee324bb607..8f8c04afe54 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 6e54b1e3408..6e54b1e3408 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 f9c920556c5..f9c920556c5 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 eee324bb607..8f8c04afe54 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 3bcb29501f7..3bcb29501f7 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 1ab2ef6b31b..1ab2ef6b31b 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 eee324bb607..8f8c04afe54 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 477f1b91311..477f1b91311 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 9eae5b0a45a..9eae5b0a45a 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 eee324bb607..8f8c04afe54 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 16666cdd9d6..16666cdd9d6 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 03ab381c539..03ab381c539 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 eee324bb607..8f8c04afe54 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 dc1892a574f..dc1892a574f 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 026f01786cb..026f01786cb 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 eee324bb607..8f8c04afe54 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 ca76b1925b3..ca76b1925b3 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 6ac76dbc89a..6ac76dbc89a 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 eee324bb607..8f8c04afe54 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 0ce97d9f095..0ce97d9f095 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 8920b07dc68..8920b07dc68 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 eee324bb607..8f8c04afe54 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 62172bc6da5..62172bc6da5 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 88697c69b08..88697c69b08 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 eee324bb607..8f8c04afe54 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 adefcdf8d59..adefcdf8d59 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 35350df995e..35350df995e 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 eee324bb607..8f8c04afe54 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 e9de3919a67..e9de3919a67 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 f53061e8a9e..f53061e8a9e 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 eee324bb607..8f8c04afe54 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 b91ee468baf..b91ee468baf 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 c18376b9292..c18376b9292 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 eee324bb607..8f8c04afe54 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 eacaebfb6e2..eacaebfb6e2 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 7b0bee1ddc0..7b0bee1ddc0 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 eee324bb607..8f8c04afe54 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 d38b0acd13f..d38b0acd13f 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 b13d46da658..b13d46da658 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 eee324bb607..8f8c04afe54 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 05788989c42..05788989c42 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 3dde87c697f..3dde87c697f 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 eee324bb607..8f8c04afe54 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 7bbfc9a4c1a..7bbfc9a4c1a 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 392cc3fcaea..392cc3fcaea 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 eee324bb607..8f8c04afe54 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 1070128188b..1070128188b 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 3fa3069dbc2..3fa3069dbc2 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 eee324bb607..8f8c04afe54 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 d3d0e1bddff..d3d0e1bddff 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 e9f7a10f254..e9f7a10f254 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 eee324bb607..8f8c04afe54 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 34c55920244..34c55920244 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 5f2df2978a7..5f2df2978a7 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 eee324bb607..8f8c04afe54 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 a6953ebd818..a6953ebd818 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 8e51bd003e6..8e51bd003e6 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 eee324bb607..8f8c04afe54 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 472ffb8163a..472ffb8163a 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 c5a03704852..c5a03704852 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 eee324bb607..8f8c04afe54 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 19966f56898..19966f56898 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 5930a3aff1e..5930a3aff1e 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 eee324bb607..8f8c04afe54 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 e4138a2b75e..e4138a2b75e 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 7cf0fa8c6a5..7cf0fa8c6a5 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 eee324bb607..8f8c04afe54 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 ee01009ed16..ee01009ed16 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 94ae336cc2c..94ae336cc2c 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 eee324bb607..8f8c04afe54 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 bf15f57e3fa..bf15f57e3fa 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 f4fc466d366..f4fc466d366 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 eee324bb607..8f8c04afe54 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 8933bfd7116..8933bfd7116 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 1573d99d010..1573d99d010 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 eee324bb607..8f8c04afe54 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 32c29f0aacf..32c29f0aacf 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 4fc4e4497a6..4fc4e4497a6 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 eee324bb607..8f8c04afe54 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 7101f86cbc5..7101f86cbc5 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 aa12ad99891..aa12ad99891 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 eee324bb607..8f8c04afe54 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 571c1bb96c8..571c1bb96c8 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 7bb02a94274..7bb02a94274 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 eee324bb607..8f8c04afe54 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 0cd7065b24f..0cd7065b24f 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 8e9211dead1..8e9211dead1 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 eee324bb607..8f8c04afe54 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 65e4a025b5d..65e4a025b5d 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 2fbd3508bc3..2fbd3508bc3 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 eee324bb607..8f8c04afe54 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 75b84199aa6..75b84199aa6 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 6c23ea45754..6c23ea45754 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 eee324bb607..8f8c04afe54 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 eda13098a51..eda13098a51 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 77ae6026c02..77ae6026c02 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 eee324bb607..8f8c04afe54 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 74fa102d258..74fa102d258 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 40eff928f3b..40eff928f3b 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 eee324bb607..8f8c04afe54 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 b1ce956e1c6..b1ce956e1c6 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 9b5a78a1df2..9b5a78a1df2 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 eee324bb607..8f8c04afe54 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 0deb002e02b..0deb002e02b 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 f568eee600c..f568eee600c 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 eee324bb607..8f8c04afe54 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 cd09e608e61..cd09e608e61 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 d9beed0ae58..d9beed0ae58 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 eee324bb607..8f8c04afe54 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 af4500f492c..af4500f492c 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 6bdcb3a5d10..6bdcb3a5d10 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 eee324bb607..8f8c04afe54 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 d2daa2064b6..d2daa2064b6 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 acfd736aac1..acfd736aac1 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 eee324bb607..8f8c04afe54 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 1812c2a1855..1812c2a1855 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 7139fa2fbf9..7139fa2fbf9 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 eee324bb607..8f8c04afe54 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 41a6fa29626..41a6fa29626 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 337587c082c..337587c082c 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 eee324bb607..8f8c04afe54 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 bead812e5aa..bead812e5aa 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 85e3fb1fc1b..85e3fb1fc1b 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 eee324bb607..8f8c04afe54 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 6daf35e61fe..6daf35e61fe 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 057ea9a69dd..057ea9a69dd 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 eee324bb607..8f8c04afe54 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 d0bddb4ea85..d0bddb4ea85 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 0b477b8c2ef..0b477b8c2ef 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 eee324bb607..8f8c04afe54 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 67633d60000..67633d60000 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 6081a00e96b..6081a00e96b 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 eee324bb607..8f8c04afe54 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 3f0ba79d399..3f0ba79d399 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 3879ce3cf09..3879ce3cf09 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 eee324bb607..8f8c04afe54 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 7aba0afce61..7aba0afce61 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 aa3ec454d10..aa3ec454d10 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 eee324bb607..8f8c04afe54 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 2caf1879a6b..2caf1879a6b 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 a8b43ce805b..a8b43ce805b 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 eee324bb607..8f8c04afe54 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 f7fdd5de4d3..f7fdd5de4d3 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 8fb2cb03082..8fb2cb03082 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 eee324bb607..8f8c04afe54 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 80b75473900..80b75473900 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 9ca8a3c321a..9ca8a3c321a 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 eee324bb607..8f8c04afe54 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 43bf8a5a1c9..43bf8a5a1c9 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 e22eae85303..e22eae85303 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 eee324bb607..8f8c04afe54 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 768e1691349..768e1691349 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 29597b8d612..29597b8d612 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 eee324bb607..8f8c04afe54 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 3360a34a238..3360a34a238 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 e56ec01d4c5..e56ec01d4c5 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 eee324bb607..8f8c04afe54 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 5e003997354..5e003997354 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 3b44c0c2704..3b44c0c2704 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 eee324bb607..8f8c04afe54 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 1ca5d50b772..1ca5d50b772 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 a81fb238aa7..a81fb238aa7 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 eee324bb607..8f8c04afe54 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 f93dd436008..f93dd436008 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 765d66b19e9..765d66b19e9 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 eee324bb607..8f8c04afe54 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 3980bbc31ce..3980bbc31ce 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 c6e00e73739..c6e00e73739 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 eee324bb607..8f8c04afe54 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 9dc0d87b63f..9dc0d87b63f 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 aabe835f2c2..aabe835f2c2 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 eee324bb607..8f8c04afe54 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 302752a2bdb..302752a2bdb 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 5d4345c0a12..5d4345c0a12 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 eee324bb607..8f8c04afe54 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 7dd678e97ad..7dd678e97ad 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 c8d502305a1..c8d502305a1 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 eee324bb607..8f8c04afe54 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 8988089abca..8988089abca 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 9c78fa8452d..9c78fa8452d 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 eee324bb607..8f8c04afe54 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 4e85a89b0d0..4e85a89b0d0 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 76e1dd4a968..76e1dd4a968 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 eee324bb607..8f8c04afe54 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 0ef405d0d91..0ef405d0d91 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 bcc8d808735..bcc8d808735 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 eee324bb607..8f8c04afe54 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 c4a76c16108..c4a76c16108 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 84f89136be1..84f89136be1 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 eee324bb607..8f8c04afe54 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 6ae222071fc..6ae222071fc 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 ce02fb51de6..ce02fb51de6 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 eee324bb607..8f8c04afe54 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 1607a5cc4fe..1607a5cc4fe 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 586b684fb98..586b684fb98 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 eee324bb607..8f8c04afe54 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 7be05df4a35..7be05df4a35 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 3c61e41263a..3c61e41263a 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 eee324bb607..8f8c04afe54 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 6e80e544ea2..6e80e544ea2 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 f537bdb22ae..f537bdb22ae 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 eee324bb607..8f8c04afe54 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 da671c9455c..da671c9455c 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 bddd7a24ed0..bddd7a24ed0 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 eee324bb607..8f8c04afe54 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 0ecfcba40b3..0ecfcba40b3 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 146b3d1aa81..146b3d1aa81 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 eee324bb607..8f8c04afe54 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 3a6bc45d3b0..3a6bc45d3b0 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 d0ad2699494..d0ad2699494 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 eee324bb607..8f8c04afe54 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 a64f264b353..a64f264b353 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 dc58176ac8b..dc58176ac8b 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 eee324bb607..8f8c04afe54 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 ea7eea1b5c8..ea7eea1b5c8 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 9f87a9aa623..9f87a9aa623 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 eee324bb607..8f8c04afe54 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 4fd2b545afc..4fd2b545afc 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 03a6a5058bf..03a6a5058bf 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 eee324bb607..8f8c04afe54 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 aa908c5da19..aa908c5da19 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 387fada651d..387fada651d 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 eee324bb607..8f8c04afe54 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 3901547d5d8..3901547d5d8 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 806a467a7fe..806a467a7fe 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 eee324bb607..8f8c04afe54 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 687d9330bdb..687d9330bdb 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 55350bf2db6..55350bf2db6 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 eee324bb607..8f8c04afe54 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 b710ed0a9f2..b710ed0a9f2 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 57cfefbe9d8..57cfefbe9d8 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 eee324bb607..8f8c04afe54 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 7188435f830..7188435f830 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 2b11109c923..2b11109c923 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 eee324bb607..8f8c04afe54 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 060b60bc71f..060b60bc71f 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 957f248b5d1..957f248b5d1 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 eee324bb607..8f8c04afe54 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 5c54702532a..5c54702532a 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 39a75d67f48..39a75d67f48 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 eee324bb607..8f8c04afe54 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 571cccfedb7..571cccfedb7 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 d64c572d11a..d64c572d11a 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 eee324bb607..8f8c04afe54 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 73c17ce7546..73c17ce7546 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 50fe0185f0a..50fe0185f0a 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 eee324bb607..8f8c04afe54 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 9647ab029a7..9647ab029a7 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 1cdb1de1d39..1cdb1de1d39 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 eee324bb607..8f8c04afe54 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 08272278677..08272278677 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 e18c581c621..e18c581c621 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 eee324bb607..8f8c04afe54 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 6aaf1700555..6aaf1700555 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 95058e6fb1d..95058e6fb1d 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 eee324bb607..8f8c04afe54 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 f2d21c30ef5..f2d21c30ef5 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 510cc4384ea..510cc4384ea 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 eee324bb607..8f8c04afe54 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 57efac1991e..57efac1991e 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 1b57f1fce30..1b57f1fce30 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 eee324bb607..8f8c04afe54 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 540c22ed8f8..540c22ed8f8 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 a3797cbf522..a3797cbf522 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 eee324bb607..8f8c04afe54 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 50220485d7c..50220485d7c 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 eae2e66f954..eae2e66f954 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 eee324bb607..8f8c04afe54 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 b5ca6a669d3..b5ca6a669d3 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 3b4b86fc9b8..3b4b86fc9b8 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 eee324bb607..8f8c04afe54 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 03f51c5c1e4..03f51c5c1e4 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 ed8c26d47e8..ed8c26d47e8 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 eee324bb607..8f8c04afe54 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 99a5cab4b5c..99a5cab4b5c 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 3f650874fa1..3f650874fa1 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 eee324bb607..8f8c04afe54 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 788f3db0817..788f3db0817 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 498b294a445..498b294a445 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 eee324bb607..8f8c04afe54 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 99d4c2103a9..99d4c2103a9 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 48a5c5cc29a..48a5c5cc29a 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 eee324bb607..8f8c04afe54 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 43eb51761db..43eb51761db 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 07188492168..07188492168 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 eee324bb607..8f8c04afe54 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 bfd74749217..bfd74749217 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 f849a5b064f..f849a5b064f 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 eee324bb607..8f8c04afe54 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 f63cbd1d01d..f63cbd1d01d 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 1d7ff6d8fb3..1d7ff6d8fb3 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 eee324bb607..8f8c04afe54 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 2e56e55a3b7..2e56e55a3b7 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 f0782f78ae8..f0782f78ae8 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 eee324bb607..8f8c04afe54 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 33f3dd529d7..33f3dd529d7 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 e8f21a2f360..e8f21a2f360 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 eee324bb607..8f8c04afe54 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 bacc602d989..bacc602d989 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 d56790b5b09..d56790b5b09 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 eee324bb607..8f8c04afe54 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 f1ab28c1f88..f1ab28c1f88 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 666b5d76214..666b5d76214 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 eee324bb607..8f8c04afe54 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 6af082dd575..6af082dd575 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 9f51523b7da..9f51523b7da 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 eee324bb607..8f8c04afe54 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 fbdaa1df7ce..fbdaa1df7ce 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 32b31cde2df..32b31cde2df 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 eee324bb607..8f8c04afe54 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 1b41c0f06e9..1b41c0f06e9 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 59ba7f29325..59ba7f29325 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 eee324bb607..8f8c04afe54 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 c0011de5e5f..c0011de5e5f 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 6481ad20220..6481ad20220 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 eee324bb607..8f8c04afe54 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 dca6cc3d42b..dca6cc3d42b 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 fdf4e0405fd..fdf4e0405fd 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 eee324bb607..8f8c04afe54 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 83f4698355c..83f4698355c 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 bb9ae926971..bb9ae926971 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 eee324bb607..8f8c04afe54 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 ce3f0497cac..ce3f0497cac 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 84f8a6d44f8..84f8a6d44f8 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 eee324bb607..8f8c04afe54 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 34a38599296..34a38599296 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 324920a3a14..324920a3a14 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 eee324bb607..8f8c04afe54 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 c0e0c74e5ca..c0e0c74e5ca 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 379381154d4..379381154d4 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 eee324bb607..8f8c04afe54 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 74d5ed19726..74d5ed19726 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 cc503b13ed4..cc503b13ed4 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 eee324bb607..8f8c04afe54 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 2337fcbd452..2337fcbd452 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 477c06a316c..477c06a316c 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 eee324bb607..8f8c04afe54 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 e9d6361703b..e9d6361703b 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 ff508ea7057..ff508ea7057 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 eee324bb607..8f8c04afe54 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 ce0ff89da58..ce0ff89da58 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 de0ed248cc2..de0ed248cc2 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 eee324bb607..8f8c04afe54 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 ccb58a596bd..ccb58a596bd 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 115422bd4a6..115422bd4a6 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 eee324bb607..8f8c04afe54 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 f2ee61e6f4f..f2ee61e6f4f 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 350fbe3fcc7..350fbe3fcc7 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 eee324bb607..8f8c04afe54 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 2e2dddfd7e4..2e2dddfd7e4 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 d59aa806ce3..d59aa806ce3 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 eee324bb607..8f8c04afe54 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 c45ef671a11..c45ef671a11 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 2dad150cb34..2dad150cb34 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 eee324bb607..8f8c04afe54 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 0b8bfe0914a..0b8bfe0914a 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 cb1ff977c68..cb1ff977c68 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 eee324bb607..8f8c04afe54 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 39f7d128eee..39f7d128eee 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 88b5433a1ff..88b5433a1ff 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 eee324bb607..8f8c04afe54 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 01ffde9253d..01ffde9253d 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 b1a9c9a4b49..b1a9c9a4b49 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 eee324bb607..8f8c04afe54 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 349b52115a9..349b52115a9 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 6148a1c88e6..6148a1c88e6 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 eee324bb607..8f8c04afe54 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 10ac5bd4b5b..10ac5bd4b5b 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 10ac5bd4b5b..10ac5bd4b5b 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 eee324bb607..8f8c04afe54 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 e0030346f8a..e0030346f8a 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 719bbf09b4e..719bbf09b4e 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 eee324bb607..8f8c04afe54 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 6ea3c445e94..6ea3c445e94 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 afa32f5b37a..afa32f5b37a 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 eee324bb607..8f8c04afe54 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 6f8d710a7c4..6f8d710a7c4 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 33e286d79f1..33e286d79f1 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 eee324bb607..8f8c04afe54 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 091941b691e..091941b691e 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 2e4456a743f..2e4456a743f 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 eee324bb607..8f8c04afe54 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 931b5112297..931b5112297 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 44555822003..44555822003 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 eee324bb607..8f8c04afe54 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 c31401f3ebe..c31401f3ebe 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 5049595af39..5049595af39 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 eee324bb607..8f8c04afe54 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 c8ce54c59e4..c8ce54c59e4 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 f1b98e21635..f1b98e21635 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 0f8cf0fb161..a603bef54ed 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 212b03a6fc4..212b03a6fc4 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 c3500b818c8..c3500b818c8 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 eee324bb607..8f8c04afe54 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 5c41eeae1a4..5c41eeae1a4 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 347d03fbe00..347d03fbe00 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 eee324bb607..8f8c04afe54 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 260a11f2713..260a11f2713 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 84be2050d9c..84be2050d9c 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 eee324bb607..8f8c04afe54 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 a26132211d2..a26132211d2 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 808af57b77a..808af57b77a 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 eee324bb607..8f8c04afe54 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 672661b6f2b..672661b6f2b 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 a3c114011e9..a3c114011e9 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 eee324bb607..8f8c04afe54 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 93d31949eab..93d31949eab 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 483c55ccc52..483c55ccc52 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 eee324bb607..8f8c04afe54 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 7305bacc068..7305bacc068 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 7a97631d337..7a97631d337 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 eee324bb607..8f8c04afe54 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 1e90e3974b2..1e90e3974b2 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 1731af4334a..1731af4334a 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 eee324bb607..8f8c04afe54 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 b0794f743c0..b0794f743c0 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 75ac12f476a..75ac12f476a 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 eee324bb607..8f8c04afe54 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 1df8d6d188c..1df8d6d188c 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 dc61b234b3b..dc61b234b3b 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 eee324bb607..8f8c04afe54 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 7dee63a8c0c..7dee63a8c0c 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 9302da9ae4d..9302da9ae4d 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 eee324bb607..8f8c04afe54 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 429299cfca1..429299cfca1 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 4b4d1de0e97..4b4d1de0e97 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 eee324bb607..8f8c04afe54 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 443f7fdf0ca..443f7fdf0ca 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 2548da1b236..2548da1b236 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 eee324bb607..8f8c04afe54 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 b7dd8fe910c..b7dd8fe910c 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 987243fad35..987243fad35 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 eee324bb607..8f8c04afe54 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 38163124c22..38163124c22 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 810c2cc50c8..810c2cc50c8 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 eee324bb607..8f8c04afe54 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 97c54f0818b..97c54f0818b 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 ca421488120..ca421488120 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 eee324bb607..8f8c04afe54 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 c34bf0ac207..c34bf0ac207 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 894b0438d5e..894b0438d5e 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 eee324bb607..8f8c04afe54 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 fa3a507ca4a..fa3a507ca4a 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 b38c3f47a0d..b38c3f47a0d 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 eee324bb607..8f8c04afe54 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 2f90840d64e..2f90840d64e 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 00bc36b686f..00bc36b686f 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 eee324bb607..8f8c04afe54 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 d6161089ba3..d6161089ba3 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 dc4b9a0dbac..dc4b9a0dbac 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 eee324bb607..8f8c04afe54 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 cf9f8d6bdae..cf9f8d6bdae 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 cdc5b23fcb4..cdc5b23fcb4 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 eee324bb607..8f8c04afe54 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 2b0d613f77a..2b0d613f77a 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 05c8a4a0273..05c8a4a0273 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 eee324bb607..8f8c04afe54 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 c41af758142..c41af758142 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 fac04b3afa5..fac04b3afa5 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 eee324bb607..8f8c04afe54 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 df9ec7f5710..df9ec7f5710 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 df8ded0e6f2..df8ded0e6f2 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 eee324bb607..8f8c04afe54 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 fdbde6130a2..fdbde6130a2 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 6716245e74a..6716245e74a 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 eee324bb607..8f8c04afe54 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 d550257eaec..d550257eaec 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 59ede3ac330..59ede3ac330 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 eee324bb607..8f8c04afe54 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 cf28d810df6..cf28d810df6 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 1d625e8dfb2..1d625e8dfb2 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 eee324bb607..8f8c04afe54 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 596203686f9..596203686f9 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 941290fc59d..941290fc59d 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 eee324bb607..8f8c04afe54 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 f97a70dd597..f97a70dd597 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 4de721142b2..4de721142b2 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 eee324bb607..8f8c04afe54 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 950fc45eec3..950fc45eec3 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 455ac586227..455ac586227 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 eee324bb607..8f8c04afe54 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 8f28753f2c2..8f28753f2c2 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 7bd513f38d1..7bd513f38d1 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 eee324bb607..8f8c04afe54 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 092b94e027d..092b94e027d 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 d836e881843..d836e881843 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 eee324bb607..8f8c04afe54 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 d4898e8a174..d4898e8a174 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 e853dc92651..e853dc92651 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 eee324bb607..8f8c04afe54 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 dcd9d9113e2..dcd9d9113e2 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 ac74f3cc144..ac74f3cc144 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 eee324bb607..8f8c04afe54 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 cae5b436b05..cae5b436b05 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 bd82cf3c9e6..bd82cf3c9e6 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 eee324bb607..8f8c04afe54 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 088417b3f90..088417b3f90 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 b4017812298..b4017812298 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 eee324bb607..8f8c04afe54 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 68f32c22270..68f32c22270 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 3bb2cabf6c7..3bb2cabf6c7 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 eee324bb607..8f8c04afe54 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 0626a13e85d..0626a13e85d 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 402877430c4..402877430c4 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 eee324bb607..8f8c04afe54 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 0256d03d1bc..0256d03d1bc 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 b3575c5b137..b3575c5b137 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 eee324bb607..8f8c04afe54 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 fb8d9ca06d6..fb8d9ca06d6 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 0a0304062bf..0a0304062bf 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 eee324bb607..8f8c04afe54 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 816ad158f9a..816ad158f9a 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 4df59412608..4df59412608 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 eee324bb607..8f8c04afe54 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 db9a1604606..db9a1604606 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 552b44a3ad9..552b44a3ad9 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 eee324bb607..8f8c04afe54 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 961a1fe5470..961a1fe5470 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 45e4626a0d8..45e4626a0d8 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 eee324bb607..8f8c04afe54 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 9c04ab4761d..9c04ab4761d 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 40c8cdd96c2..40c8cdd96c2 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 eee324bb607..8f8c04afe54 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 3aa1472e579..3aa1472e579 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 e32b332d3ba..e32b332d3ba 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 eee324bb607..8f8c04afe54 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 ba9a001ffb4..ba9a001ffb4 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 15c07327ed8..15c07327ed8 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 eee324bb607..8f8c04afe54 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 0f714bbe442..0f714bbe442 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 93c8649f4fe..93c8649f4fe 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 eee324bb607..8f8c04afe54 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 73f526785dc..73f526785dc 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 c04805976df..c04805976df 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 eee324bb607..8f8c04afe54 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 4c41d677bdb..4c41d677bdb 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 559ce387ba5..559ce387ba5 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 eee324bb607..8f8c04afe54 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 09f1a2240c7..09f1a2240c7 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 da29a4658eb..da29a4658eb 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 eee324bb607..8f8c04afe54 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 a00fef6402c..a00fef6402c 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 898f02c041f..898f02c041f 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 eee324bb607..8f8c04afe54 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 f113cd80ea3..f113cd80ea3 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 97272ed2287..97272ed2287 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 eee324bb607..8f8c04afe54 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 5c49ae22e16..5c49ae22e16 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 290faa83351..290faa83351 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 eee324bb607..8f8c04afe54 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 cdcec7e1b75..cdcec7e1b75 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 6cdbf5feaf8..6cdbf5feaf8 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 eee324bb607..8f8c04afe54 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 da9305bb1e6..da9305bb1e6 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 655ff7dc3fd..655ff7dc3fd 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 eee324bb607..8f8c04afe54 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 46908129146..46908129146 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 652d8d5a5ec..652d8d5a5ec 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 eee324bb607..8f8c04afe54 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 392ae5d066d..392ae5d066d 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 790a6706030..790a6706030 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 eee324bb607..8f8c04afe54 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 10c3198406d..10c3198406d 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 beb6b852bcb..beb6b852bcb 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 eee324bb607..8f8c04afe54 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 90c26f006ff..90c26f006ff 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 d795b253448..d795b253448 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 eee324bb607..8f8c04afe54 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 ac82822920a..ac82822920a 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 40c704c7c00..40c704c7c00 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 eee324bb607..8f8c04afe54 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 a8da4b49f7b..a8da4b49f7b 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 276c34d4fb0..276c34d4fb0 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 eee324bb607..8f8c04afe54 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 b10c999db5d..b10c999db5d 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 72e8660020a..72e8660020a 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 eee324bb607..8f8c04afe54 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 a800067d564..a800067d564 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 d316cb2ab75..d316cb2ab75 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 eee324bb607..8f8c04afe54 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 48d629b4c45..48d629b4c45 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 0446f698639..0446f698639 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 eee324bb607..8f8c04afe54 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 80504edf485..80504edf485 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 48f32db0226..48f32db0226 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 eee324bb607..8f8c04afe54 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 3c799a918d5..3c799a918d5 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 a420db74288..a420db74288 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 eee324bb607..8f8c04afe54 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 37f5a1c8999..37f5a1c8999 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 208132f897e..208132f897e 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 eee324bb607..8f8c04afe54 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 7f7553fb803..7f7553fb803 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 880fa86a9bc..880fa86a9bc 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 eee324bb607..8f8c04afe54 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 bf3d5862d7d..bf3d5862d7d 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 bb738d2d13a..bb738d2d13a 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 eee324bb607..8f8c04afe54 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 0a0a67946be..0a0a67946be 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 9ea855179bb..9ea855179bb 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 eee324bb607..8f8c04afe54 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 dd8b4338eeb..dd8b4338eeb 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 54e51dcdd44..54e51dcdd44 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 eee324bb607..8f8c04afe54 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 5a2d7e6ccf8..5a2d7e6ccf8 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 1fd3098a319..1fd3098a319 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 eee324bb607..8f8c04afe54 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 a502b52604f..a502b52604f 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 73057a885cc..73057a885cc 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 eee324bb607..8f8c04afe54 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 c8ce5a52671..c8ce5a52671 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 312f9ebe0cf..312f9ebe0cf 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 eee324bb607..8f8c04afe54 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 1dad1b91e6d..1dad1b91e6d 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 4a2102b575d..4a2102b575d 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 eee324bb607..8f8c04afe54 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 f16533cf39e..f16533cf39e 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 c4e216ea63d..c4e216ea63d 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 eee324bb607..8f8c04afe54 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 cd2c31a6f9e..cd2c31a6f9e 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 4c6aa707afc..4c6aa707afc 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 eee324bb607..8f8c04afe54 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 8b300f5e991..8b300f5e991 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 943e57a7c0c..943e57a7c0c 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 eee324bb607..8f8c04afe54 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 269315ffd45..269315ffd45 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 c7fea117db3..c7fea117db3 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 eee324bb607..8f8c04afe54 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 56979588468..56979588468 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 a3c961c33e3..a3c961c33e3 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 eee324bb607..8f8c04afe54 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 e3266e754cc..e3266e754cc 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 d655a4eeac7..d655a4eeac7 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 eee324bb607..8f8c04afe54 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 4aa472691b8..4aa472691b8 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 57264527a05..57264527a05 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 eee324bb607..8f8c04afe54 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 edd1d71816d..edd1d71816d 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 d378e511ba8..d378e511ba8 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 eee324bb607..8f8c04afe54 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 c683afa9d96..c683afa9d96 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 a25c3f25659..a25c3f25659 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 eee324bb607..8f8c04afe54 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 f730a5575b7..f730a5575b7 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 5cb0a919cf2..5cb0a919cf2 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 eee324bb607..8f8c04afe54 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 6ceecbe3fae..6ceecbe3fae 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 d44b58e4a0a..d44b58e4a0a 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 eee324bb607..8f8c04afe54 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 62be1875e80..62be1875e80 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 e24b5fee8c6..e24b5fee8c6 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 eee324bb607..8f8c04afe54 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 6023cc4d7a6..6023cc4d7a6 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 0cbd8338cc3..0cbd8338cc3 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 eee324bb607..8f8c04afe54 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 120ee49bc0b..120ee49bc0b 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 8935e26790f..8935e26790f 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 eee324bb607..8f8c04afe54 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 808529d0504..808529d0504 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 ab0d5cb257e..ab0d5cb257e 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 eee324bb607..8f8c04afe54 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 38f3925adde..38f3925adde 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 97783b67203..97783b67203 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 eee324bb607..8f8c04afe54 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 32bec14db9d..32bec14db9d 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 49bcc6e2fbd..49bcc6e2fbd 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 eee324bb607..8f8c04afe54 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 db531056fea..db531056fea 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 bcc55005d52..bcc55005d52 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 eee324bb607..8f8c04afe54 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 5648c5c60d7..5648c5c60d7 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 76c76abf6b9..76c76abf6b9 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 eee324bb607..8f8c04afe54 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 3b38b5dd05e..3b38b5dd05e 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 22b944a0992..22b944a0992 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 eee324bb607..8f8c04afe54 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 5516de05f27..5516de05f27 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 72bbb9c3fbf..72bbb9c3fbf 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 eee324bb607..8f8c04afe54 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 7e1a72acfde..7e1a72acfde 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 811ad6329b9..811ad6329b9 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 eee324bb607..8f8c04afe54 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 af63d87c190..af63d87c190 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 b4e0edcb00c..b4e0edcb00c 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 eee324bb607..8f8c04afe54 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 32bdede6c3a..32bdede6c3a 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 1b6ec7ae97b..1b6ec7ae97b 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 eee324bb607..8f8c04afe54 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 66ef8dd6beb..66ef8dd6beb 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 5b74a125f02..5b74a125f02 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 eee324bb607..8f8c04afe54 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 a0f265545a0..a0f265545a0 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 faf260cc0de..faf260cc0de 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 eee324bb607..8f8c04afe54 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 563cc3de838..563cc3de838 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 a901fb410aa..a901fb410aa 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 eee324bb607..8f8c04afe54 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 6a76525e381..6a76525e381 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 173988d3f16..173988d3f16 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 eee324bb607..8f8c04afe54 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 31eac1ee59d..31eac1ee59d 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 82f0fea6c1a..82f0fea6c1a 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 eee324bb607..8f8c04afe54 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 884937dbc62..884937dbc62 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 b56f658682c..b56f658682c 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 eee324bb607..8f8c04afe54 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 9c092c8c96f..9c092c8c96f 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 f828b20df45..f828b20df45 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 eee324bb607..8f8c04afe54 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 158789e802a..158789e802a 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 c86ca4271fb..c86ca4271fb 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 eee324bb607..8f8c04afe54 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 94a3588bae0..94a3588bae0 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 5bee3a26cab..5bee3a26cab 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 eee324bb607..8f8c04afe54 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 a2ddf89edcc..a2ddf89edcc 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 f126d65a8ae..f126d65a8ae 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 eee324bb607..8f8c04afe54 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 1ac0695e3a6..1ac0695e3a6 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 43368424d35..43368424d35 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 eee324bb607..8f8c04afe54 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 5d233fd807b..5d233fd807b 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 201ade8b755..201ade8b755 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 eee324bb607..8f8c04afe54 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 73c9f6df799..73c9f6df799 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 51e68871ee2..51e68871ee2 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 eee324bb607..8f8c04afe54 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 ec38303961e..ec38303961e 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 428413d2dc9..428413d2dc9 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 eee324bb607..8f8c04afe54 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 2b960354054..2b960354054 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 cf9e695f359..cf9e695f359 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 eee324bb607..8f8c04afe54 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 00f201a7831..00f201a7831 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 753eb0a4a04..753eb0a4a04 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 eee324bb607..8f8c04afe54 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 6e0baafca07..6e0baafca07 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 0f4a911f12c..0f4a911f12c 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 eee324bb607..8f8c04afe54 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 27192ce6930..27192ce6930 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 9baff482c02..9baff482c02 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 eee324bb607..8f8c04afe54 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 fab78335eeb..fab78335eeb 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 6ac95f3166a..6ac95f3166a 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 eee324bb607..8f8c04afe54 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 ed9156bb8ad..ed9156bb8ad 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 27ae8ed56a0..27ae8ed56a0 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 eee324bb607..8f8c04afe54 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 6bf75a99323..6bf75a99323 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 38d176d8c30..38d176d8c30 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 eee324bb607..8f8c04afe54 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 8dd05584d2a..8dd05584d2a 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 77be59e1226..77be59e1226 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 eee324bb607..8f8c04afe54 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 fb078606259..fb078606259 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 4c180c1c636..4c180c1c636 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 eee324bb607..8f8c04afe54 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 4d63969baad..4d63969baad 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 66a951e2cfd..66a951e2cfd 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 eee324bb607..8f8c04afe54 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 06fc4a13ebd..06fc4a13ebd 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 47a2fe8b31a..47a2fe8b31a 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 eee324bb607..8f8c04afe54 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 430476e7ca9..430476e7ca9 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 c44add76754..c44add76754 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 eee324bb607..8f8c04afe54 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 32ed89c22f9..32ed89c22f9 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 fd6c181ed05..fd6c181ed05 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 eee324bb607..8f8c04afe54 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 5fbb5097dd4..5fbb5097dd4 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 daa99400b32..daa99400b32 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 eee324bb607..8f8c04afe54 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 66bd7dbd7d3..66bd7dbd7d3 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 063e16dc96d..063e16dc96d 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 eee324bb607..8f8c04afe54 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 1c8c91c518f..1c8c91c518f 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 5a3b6c737db..5a3b6c737db 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 eee324bb607..8f8c04afe54 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 5d35f202cc5..5d35f202cc5 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 cc4ba76506e..cc4ba76506e 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 eee324bb607..8f8c04afe54 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 50213bcb6f7..50213bcb6f7 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 70b0b70fea2..70b0b70fea2 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 eee324bb607..8f8c04afe54 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 15f141ce6c2..15f141ce6c2 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 093bc872cc7..093bc872cc7 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 eee324bb607..8f8c04afe54 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 efe49cc4b5a..efe49cc4b5a 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 3de6140a529..3de6140a529 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 eee324bb607..8f8c04afe54 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 a417b3b9cd1..a417b3b9cd1 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 fe17569b4f5..fe17569b4f5 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 eee324bb607..8f8c04afe54 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 5ecc4a1483b..5ecc4a1483b 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 85e3be9d824..85e3be9d824 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 eee324bb607..8f8c04afe54 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 1d5d403b853..1d5d403b853 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 bb7d888fb27..bb7d888fb27 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 eee324bb607..8f8c04afe54 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 830c62f0ed6..830c62f0ed6 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 2734464370a..2734464370a 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 eee324bb607..8f8c04afe54 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 184183b0111..184183b0111 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 49a91133f41..49a91133f41 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 eee324bb607..8f8c04afe54 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 c2547bed270..c2547bed270 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 b1f1f97bc6f..b1f1f97bc6f 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 eee324bb607..8f8c04afe54 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 5ef919ffb17..5ef919ffb17 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 018121da8c4..018121da8c4 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 eee324bb607..8f8c04afe54 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 49bdf0c926a..49bdf0c926a 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 f72ba5ae39a..f72ba5ae39a 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 eee324bb607..8f8c04afe54 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 a026d246d6b..a026d246d6b 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 15a7c8f444f..15a7c8f444f 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 eee324bb607..8f8c04afe54 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 2d15ee09be4..2d15ee09be4 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 34d6c9ca5fd..34d6c9ca5fd 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 eee324bb607..8f8c04afe54 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 1f45b956082..1f45b956082 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 e29173bf38b..e29173bf38b 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 eee324bb607..8f8c04afe54 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 0def64b6077..0def64b6077 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 1174601b7ee..1174601b7ee 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 eee324bb607..8f8c04afe54 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 0fbc9cd936b..0fbc9cd936b 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 7d2c6cbaadf..7d2c6cbaadf 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 eee324bb607..8f8c04afe54 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 2417a963c14..2417a963c14 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 08665a69e4d..08665a69e4d 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 eee324bb607..8f8c04afe54 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 000faeeca0f..000faeeca0f 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 d123135d358..d123135d358 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 eee324bb607..8f8c04afe54 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 8e2e9f88d49..8e2e9f88d49 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 6f51ec1d823..6f51ec1d823 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 eee324bb607..8f8c04afe54 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 251f5a0058b..251f5a0058b 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 076cd9d5ede..076cd9d5ede 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 eee324bb607..8f8c04afe54 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 314760606d7..314760606d7 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 6b6c0902611..6b6c0902611 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 eee324bb607..8f8c04afe54 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 a6af650f328..a6af650f328 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 e7d38c64edb..e7d38c64edb 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 eee324bb607..8f8c04afe54 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 964e335c80c..964e335c80c 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 e008bcdb201..e008bcdb201 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 eee324bb607..8f8c04afe54 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 76acb24ce65..76acb24ce65 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 ebffcaf3b2f..ebffcaf3b2f 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 eee324bb607..8f8c04afe54 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 e2cdd8fbf4a..e2cdd8fbf4a 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 9989b2b98d4..9989b2b98d4 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 eee324bb607..8f8c04afe54 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 b0488020e33..b0488020e33 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 b4abb4f2236..b4abb4f2236 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 eee324bb607..8f8c04afe54 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 06ef95a09c7..06ef95a09c7 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 e2ff9b84df2..e2ff9b84df2 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 eee324bb607..8f8c04afe54 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 cec47cc18b8..cec47cc18b8 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 792e0c2f9af..792e0c2f9af 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 eee324bb607..8f8c04afe54 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 198eb95a02c..198eb95a02c 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 3cb21cb46a8..3cb21cb46a8 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 eee324bb607..8f8c04afe54 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 e30816acba9..e30816acba9 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 d1435f6812f..d1435f6812f 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 eee324bb607..8f8c04afe54 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 ad2f923975b..ad2f923975b 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 9fdd116431c..9fdd116431c 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 eee324bb607..8f8c04afe54 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 4164eb9cc51..4164eb9cc51 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 d4b992031e6..d4b992031e6 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 eee324bb607..8f8c04afe54 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 ba893453cfb..ba893453cfb 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 a26b5e3341d..a26b5e3341d 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 eee324bb607..8f8c04afe54 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 74cf45c696f..74cf45c696f 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 d1f17dc660d..d1f17dc660d 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 eee324bb607..8f8c04afe54 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 c67ad93dea1..c67ad93dea1 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 4d3b83da144..4d3b83da144 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 eee324bb607..8f8c04afe54 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 063c5d8e497..063c5d8e497 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 2f3410416aa..2f3410416aa 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 eee324bb607..8f8c04afe54 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 68fe7d7a7b7..68fe7d7a7b7 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 49d5397f10c..49d5397f10c 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 eee324bb607..8f8c04afe54 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 43f92f2ff06..43f92f2ff06 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 0c6cdd98c9a..0c6cdd98c9a 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 eee324bb607..8f8c04afe54 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 c9402ccce02..c9402ccce02 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 1d3a7bf20b4..1d3a7bf20b4 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 eee324bb607..8f8c04afe54 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 961750ce61b..961750ce61b 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 a04f5b1db7c..a04f5b1db7c 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 eee324bb607..8f8c04afe54 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 442b5d20d03..442b5d20d03 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 85e5dadaf15..85e5dadaf15 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 eee324bb607..8f8c04afe54 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 42d363b2096..42d363b2096 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 1d6133cd261..1d6133cd261 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 eee324bb607..8f8c04afe54 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 51b3c639ae9..51b3c639ae9 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 85d01453267..85d01453267 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 eee324bb607..8f8c04afe54 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 fb3012d69e6..fb3012d69e6 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 f6e60135e83..f6e60135e83 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 eee324bb607..8f8c04afe54 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 fef76004205..fef76004205 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 2623584897e..2623584897e 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 eee324bb607..8f8c04afe54 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 cb1ef0a375d..cb1ef0a375d 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 1537548bf1c..1537548bf1c 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 eee324bb607..8f8c04afe54 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 59e5adbc08f..59e5adbc08f 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 c62556c718f..c62556c718f 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 eee324bb607..8f8c04afe54 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 378762b1222..378762b1222 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 dcb34e402b2..dcb34e402b2 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 eee324bb607..8f8c04afe54 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 7659c8ae978..7659c8ae978 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 afee708308b..afee708308b 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 eee324bb607..8f8c04afe54 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 2f3fb8327f2..2f3fb8327f2 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 39336c1b51f..39336c1b51f 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 eee324bb607..8f8c04afe54 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 d788e414ace..d788e414ace 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 a4f761c24d5..a4f761c24d5 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 eee324bb607..8f8c04afe54 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 39d1af5bf52..39d1af5bf52 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 943ee246928..943ee246928 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 eee324bb607..8f8c04afe54 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 d7ebeadd294..d7ebeadd294 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 34a534c1fe6..34a534c1fe6 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 eee324bb607..8f8c04afe54 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 1fe11487dbc..1fe11487dbc 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 0a1267128da..0a1267128da 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 eee324bb607..8f8c04afe54 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 60e563ec2ea..60e563ec2ea 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 35c5bb019ba..35c5bb019ba 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 eee324bb607..8f8c04afe54 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 0a9aa857724..0a9aa857724 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 7c0aa490986..7c0aa490986 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 eee324bb607..8f8c04afe54 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 987721454ab..987721454ab 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 3a1127dc2ef..3a1127dc2ef 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 eee324bb607..8f8c04afe54 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 a60ea255c57..a60ea255c57 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 35886309945..35886309945 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 eee324bb607..8f8c04afe54 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 51bafd9703f..51bafd9703f 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 c00cdc12587..c00cdc12587 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 eee324bb607..8f8c04afe54 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 b8938391204..b8938391204 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 16e3f12c3a5..16e3f12c3a5 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 eee324bb607..8f8c04afe54 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 813d577ed81..813d577ed81 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 2f77c61e3d3..2f77c61e3d3 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 eee324bb607..8f8c04afe54 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 32860f13afa..32860f13afa 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 034abcfc0d1..034abcfc0d1 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 eee324bb607..8f8c04afe54 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 abcde385522..abcde385522 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 cc3fb66656f..cc3fb66656f 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 eee324bb607..8f8c04afe54 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 a55fad0b0da..a55fad0b0da 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 632434c6262..632434c6262 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 eee324bb607..8f8c04afe54 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 8a628e8d19e..8a628e8d19e 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 9069333a7ff..9069333a7ff 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 eee324bb607..8f8c04afe54 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 9fa111163f4..9fa111163f4 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 0afdec62bcc..0afdec62bcc 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 eee324bb607..8f8c04afe54 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 c43b046e765..c43b046e765 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 1b28a9ba1b3..1b28a9ba1b3 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 eee324bb607..8f8c04afe54 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 4c244ac3213..4c244ac3213 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 0952ca6d29e..0952ca6d29e 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 eee324bb607..8f8c04afe54 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()