Intermediate changes

408 files changed, 272 insertions, 272 deletions

diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin-x86_64.txt
index a85dbb45d3..a85dbb45d3 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux-x86_64.txt
index a51d5c8880..a51d5c8880 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin-x86_64.txt
index 76a5810817..76a5810817 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux-x86_64.txt
index 22f298cf7d..22f298cf7d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin-x86_64.txt
index 3efe12ff58..3efe12ff58 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux-x86_64.txt
index 55ca1c759b..55ca1c759b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin-x86_64.txt
index 65d79f1a81..65d79f1a81 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux-x86_64.txt
index adde78aabe..adde78aabe 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin-x86_64.txt
index a1f6d47793..a1f6d47793 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux-x86_64.txt
index e7af2024c1..e7af2024c1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin-x86_64.txt
index 0650809a3b..0650809a3b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux-x86_64.txt
index f55013927e..f55013927e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin-x86_64.txt
index 8bb73fa532..8bb73fa532 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux-x86_64.txt
index a632a01f09..a632a01f09 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin-x86_64.txt
index 1fa7e9da7f..1fa7e9da7f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux-x86_64.txt
index bb6a283f3b..bb6a283f3b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin-x86_64.txt
index f98e8828e7..f98e8828e7 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux-x86_64.txt
index 451fce6d4a..451fce6d4a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin-x86_64.txt
index ec53f57bc1..ec53f57bc1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux-x86_64.txt
index a1ceaf2b75..a1ceaf2b75 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin-x86_64.txt
index 068982719c..068982719c 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux-x86_64.txt
index 737ba55d85..737ba55d85 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin-x86_64.txt
index 564e9bb142..564e9bb142 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux-x86_64.txt
index 51892581b3..51892581b3 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin-x86_64.txt
index 18d72c6685..18d72c6685 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux-x86_64.txt
index 43faced540..43faced540 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin-x86_64.txt
index 7901d8cf24..7901d8cf24 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux-x86_64.txt
index f2e0472a5d..f2e0472a5d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin-x86_64.txt
index e46d70dd3e..e46d70dd3e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux-x86_64.txt
index 3837b42396..3837b42396 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin-x86_64.txt
index dc048c9436..dc048c9436 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux-x86_64.txt
index cdf38f454c..cdf38f454c 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin-x86_64.txt
index a5ff3f433a..a5ff3f433a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux-x86_64.txt
index 653bb04f7a..653bb04f7a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/CMakeLists.darwin-x86_64.txt
index 74ef613f08..74ef613f08 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/CMakeLists.linux-x86_64.txt
index 07f9f59ee4..07f9f59ee4 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/CMakeLists.txt b/contrib/restricted/abseil-cpp/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin-x86_64.txt
index 535abc7c56..535abc7c56 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux-x86_64.txt
index e29a80e43d..e29a80e43d 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin-x86_64.txt
index 1c3e1d4deb..1c3e1d4deb 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux-x86_64.txt
index 89d5fdbf42..89d5fdbf42 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/base/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin-x86_64.txt
index 3be1fa1692..3be1fa1692 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux-x86_64.txt
index bf4cf39aa9..bf4cf39aa9 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin-x86_64.txt
index 3c60c7b056..3c60c7b056 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux-x86_64.txt
index 89a07a760b..89a07a760b 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin-x86_64.txt
index 51a0971139..51a0971139 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux-x86_64.txt
index a61094881a..a61094881a 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin-x86_64.txt
index e73fa82ef7..e73fa82ef7 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux-x86_64.txt
index fb49dbcfee..fb49dbcfee 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/functional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin-x86_64.txt
index bb7bb34def..bb7bb34def 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux-x86_64.txt
index 54f9fbec1c..54f9fbec1c 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin-x86_64.txt
index c2793a97ea..c2793a97ea 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux-x86_64.txt
index a7743e41a0..a7743e41a0 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/log/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin-x86_64.txt
index 3235ac4ba5..3235ac4ba5 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux-x86_64.txt
index e87b112e2f..e87b112e2f 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/memory/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin-x86_64.txt
index cba7d55611..cba7d55611 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux-x86_64.txt
index 1bb7f8ea3e..1bb7f8ea3e 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/meta/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin-x86_64.txt
index 82fe8b2770..82fe8b2770 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux-x86_64.txt
index a6593d4b95..a6593d4b95 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/numeric/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin-x86_64.txt
index 15c4b76f67..15c4b76f67 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux-x86_64.txt
index 876a1ced58..876a1ced58 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/profiling/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin-x86_64.txt
index 324203b94a..324203b94a 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux-x86_64.txt
index b630e36b39..b630e36b39 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/random/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin-x86_64.txt
index 82c6e43c91..82c6e43c91 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux-x86_64.txt
index ef805d8dde..ef805d8dde 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin-x86_64.txt
index e3aa400b95..e3aa400b95 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux-x86_64.txt
index 2da01ab774..2da01ab774 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/strings/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin-x86_64.txt
index 16ea7b2596..16ea7b2596 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux-x86_64.txt
index 358da661fc..358da661fc 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin-x86_64.txt
index af147aa171..af147aa171 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux-x86_64.txt
index e934d9a1f3..e934d9a1f3 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/time/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin-x86_64.txt
index 9c24497045..9c24497045 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux-x86_64.txt
index cbc8bf8b2e..cbc8bf8b2e 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin-x86_64.txt
index a2f021177a..a2f021177a 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux-x86_64.txt
index 9f8f6c068d..9f8f6c068d 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/utility/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin-x86_64.txt
index c28381a676..c28381a676 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.linux-x86_64.txt
index d729ec396a..d729ec396a 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin-x86_64.txt
index c6d3f58fef..c6d3f58fef 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.linux-x86_64.txt
index 2e36a7692b..2e36a7692b 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin-x86_64.txt
index d7f9cd17a6..d7f9cd17a6 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux-x86_64.txt
index e754eefb5a..e754eefb5a 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-event-stream/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
index 64d2a9dee3..64d2a9dee3 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
index 859d5769a1..859d5769a1 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-c-io/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/aws-checksums/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.darwin-x86_64.txt
index c7805ff1e2..c7805ff1e2 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-checksums/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/aws-checksums/CMakeLists.linux.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.linux-x86_64.txt
index 70c75162ac..70c75162ac 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-checksums/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/aws-checksums/CMakeLists.txt b/contrib/restricted/aws/aws-checksums/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/aws-checksums/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-checksums/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt b/contrib/restricted/aws/s2n/CMakeLists.darwin-x86_64.txt
index 976996467f..976996467f 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/aws/s2n/CMakeLists.linux.txt b/contrib/restricted/aws/s2n/CMakeLists.linux-x86_64.txt
index e4b895391c..e4b895391c 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/aws/s2n/CMakeLists.txt b/contrib/restricted/aws/s2n/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/CMakeLists.darwin.txt b/contrib/restricted/boost/CMakeLists.darwin-x86_64.txt
index 2ce12f636b..2ce12f636b 100644
--- a/contrib/restricted/boost/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/CMakeLists.linux.txt b/contrib/restricted/boost/CMakeLists.linux-x86_64.txt
index 2ce12f636b..2ce12f636b 100644
--- a/contrib/restricted/boost/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/CMakeLists.txt b/contrib/restricted/boost/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/CMakeLists.txt
+++ b/contrib/restricted/boost/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.darwin.txt b/contrib/restricted/boost/algorithm/CMakeLists.darwin-x86_64.txt
index 7601e49d0f..7601e49d0f 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.linux.txt b/contrib/restricted/boost/algorithm/CMakeLists.linux-x86_64.txt
index ded7dbfbd8..ded7dbfbd8 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.txt b/contrib/restricted/boost/algorithm/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/align/CMakeLists.darwin.txt b/contrib/restricted/boost/align/CMakeLists.darwin-x86_64.txt
index b4f255a0c6..b4f255a0c6 100644
--- a/contrib/restricted/boost/align/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/align/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/align/CMakeLists.linux.txt b/contrib/restricted/boost/align/CMakeLists.linux-x86_64.txt
index e032aaa404..e032aaa404 100644
--- a/contrib/restricted/boost/align/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/align/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/align/CMakeLists.txt b/contrib/restricted/boost/align/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/align/CMakeLists.txt
+++ b/contrib/restricted/boost/align/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/any/CMakeLists.darwin.txt b/contrib/restricted/boost/any/CMakeLists.darwin-x86_64.txt
index 946a109665..946a109665 100644
--- a/contrib/restricted/boost/any/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/any/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/any/CMakeLists.linux.txt b/contrib/restricted/boost/any/CMakeLists.linux-x86_64.txt
index b1d4845050..b1d4845050 100644
--- a/contrib/restricted/boost/any/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/any/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/any/CMakeLists.txt b/contrib/restricted/boost/any/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/any/CMakeLists.txt
+++ b/contrib/restricted/boost/any/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/array/CMakeLists.darwin.txt b/contrib/restricted/boost/array/CMakeLists.darwin-x86_64.txt
index f640cbf516..f640cbf516 100644
--- a/contrib/restricted/boost/array/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/array/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/array/CMakeLists.linux.txt b/contrib/restricted/boost/array/CMakeLists.linux-x86_64.txt
index 157f171696..157f171696 100644
--- a/contrib/restricted/boost/array/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/array/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/array/CMakeLists.txt b/contrib/restricted/boost/array/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/array/CMakeLists.txt
+++ b/contrib/restricted/boost/array/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/asio/CMakeLists.darwin.txt b/contrib/restricted/boost/asio/CMakeLists.darwin-x86_64.txt
index 74b17e3e1b..74b17e3e1b 100644
--- a/contrib/restricted/boost/asio/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/asio/CMakeLists.linux.txt b/contrib/restricted/boost/asio/CMakeLists.linux-x86_64.txt
index 0108378f15..0108378f15 100644
--- a/contrib/restricted/boost/asio/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/asio/CMakeLists.txt b/contrib/restricted/boost/asio/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/asio/CMakeLists.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/assert/CMakeLists.darwin.txt b/contrib/restricted/boost/assert/CMakeLists.darwin-x86_64.txt
index 0ba173db4f..0ba173db4f 100644
--- a/contrib/restricted/boost/assert/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/assert/CMakeLists.linux.txt b/contrib/restricted/boost/assert/CMakeLists.linux-x86_64.txt
index bd55d5ef61..bd55d5ef61 100644
--- a/contrib/restricted/boost/assert/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/assert/CMakeLists.txt b/contrib/restricted/boost/assert/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/assert/CMakeLists.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/atomic/CMakeLists.darwin.txt b/contrib/restricted/boost/atomic/CMakeLists.darwin-x86_64.txt
index c7c24c5a0f..c7c24c5a0f 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/atomic/CMakeLists.linux.txt b/contrib/restricted/boost/atomic/CMakeLists.linux-x86_64.txt
index 5f830a8cfa..5f830a8cfa 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/atomic/CMakeLists.txt b/contrib/restricted/boost/atomic/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt
index c44e09b7d6..c44e09b7d6 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/bimap/CMakeLists.linux.txt b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt
index ec170e9cbc..ec170e9cbc 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/bimap/CMakeLists.txt b/contrib/restricted/boost/bimap/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/bind/CMakeLists.darwin.txt b/contrib/restricted/boost/bind/CMakeLists.darwin-x86_64.txt
index 88c5f9bf7b..88c5f9bf7b 100644
--- a/contrib/restricted/boost/bind/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/bind/CMakeLists.linux.txt b/contrib/restricted/boost/bind/CMakeLists.linux-x86_64.txt
index d77d1b474b..d77d1b474b 100644
--- a/contrib/restricted/boost/bind/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/bind/CMakeLists.txt b/contrib/restricted/boost/bind/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/bind/CMakeLists.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/chrono/CMakeLists.darwin.txt b/contrib/restricted/boost/chrono/CMakeLists.darwin-x86_64.txt
index af74091cab..af74091cab 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/chrono/CMakeLists.linux.txt b/contrib/restricted/boost/chrono/CMakeLists.linux-x86_64.txt
index 849cd7c215..849cd7c215 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/chrono/CMakeLists.txt b/contrib/restricted/boost/chrono/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt b/contrib/restricted/boost/concept_check/CMakeLists.darwin-x86_64.txt
index 4bea4830c4..4bea4830c4 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt b/contrib/restricted/boost/concept_check/CMakeLists.linux-x86_64.txt
index e2b6d7b868..e2b6d7b868 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.txt b/contrib/restricted/boost/concept_check/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/config/CMakeLists.darwin.txt b/contrib/restricted/boost/config/CMakeLists.darwin-x86_64.txt
index b3623a130d..b3623a130d 100644
--- a/contrib/restricted/boost/config/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/config/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/config/CMakeLists.linux.txt b/contrib/restricted/boost/config/CMakeLists.linux-x86_64.txt
index 5bebf20e98..5bebf20e98 100644
--- a/contrib/restricted/boost/config/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/config/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/config/CMakeLists.txt b/contrib/restricted/boost/config/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/config/CMakeLists.txt
+++ b/contrib/restricted/boost/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/container/CMakeLists.darwin.txt b/contrib/restricted/boost/container/CMakeLists.darwin-x86_64.txt
index 74ef11ce7c..74ef11ce7c 100644
--- a/contrib/restricted/boost/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/container/CMakeLists.linux.txt b/contrib/restricted/boost/container/CMakeLists.linux-x86_64.txt
index 8478a2b475..8478a2b475 100644
--- a/contrib/restricted/boost/container/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/container/CMakeLists.txt b/contrib/restricted/boost/container/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/container/CMakeLists.txt
+++ b/contrib/restricted/boost/container/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.darwin.txt b/contrib/restricted/boost/container_hash/CMakeLists.darwin-x86_64.txt
index f6ba33a6e9..f6ba33a6e9 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.linux.txt b/contrib/restricted/boost/container_hash/CMakeLists.linux-x86_64.txt
index 0e9a7fc390..0e9a7fc390 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.txt b/contrib/restricted/boost/container_hash/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin-x86_64.txt
index d5301afd15..d5301afd15 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux-x86_64.txt
index 21ce313ed9..21ce313ed9 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin-x86_64.txt
index 100cd01a5d..100cd01a5d 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-x86_64.txt
index 06f9049883..06f9049883 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/conversion/CMakeLists.darwin.txt b/contrib/restricted/boost/conversion/CMakeLists.darwin-x86_64.txt
index f1a53fd123..f1a53fd123 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/conversion/CMakeLists.linux.txt b/contrib/restricted/boost/conversion/CMakeLists.linux-x86_64.txt
index ccc6337d05..ccc6337d05 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/conversion/CMakeLists.txt b/contrib/restricted/boost/conversion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/core/CMakeLists.darwin.txt b/contrib/restricted/boost/core/CMakeLists.darwin-x86_64.txt
index 8b4b0f15da..8b4b0f15da 100644
--- a/contrib/restricted/boost/core/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/core/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/core/CMakeLists.linux.txt b/contrib/restricted/boost/core/CMakeLists.linux-x86_64.txt
index 9a1bc62706..9a1bc62706 100644
--- a/contrib/restricted/boost/core/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/core/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/core/CMakeLists.txt b/contrib/restricted/boost/core/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/core/CMakeLists.txt
+++ b/contrib/restricted/boost/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt b/contrib/restricted/boost/coroutine/CMakeLists.darwin-x86_64.txt
index 078b319b34..078b319b34 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt b/contrib/restricted/boost/coroutine/CMakeLists.linux-x86_64.txt
index d91726a632..d91726a632 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.txt b/contrib/restricted/boost/coroutine/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/crc/CMakeLists.darwin.txt b/contrib/restricted/boost/crc/CMakeLists.darwin-x86_64.txt
index 2730ce7c01..2730ce7c01 100644
--- a/contrib/restricted/boost/crc/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/crc/CMakeLists.linux.txt b/contrib/restricted/boost/crc/CMakeLists.linux-x86_64.txt
index 6473832eb1..6473832eb1 100644
--- a/contrib/restricted/boost/crc/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/crc/CMakeLists.txt b/contrib/restricted/boost/crc/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/crc/CMakeLists.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt b/contrib/restricted/boost/date_time/CMakeLists.darwin-x86_64.txt
index da90148a57..da90148a57 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/date_time/CMakeLists.linux.txt b/contrib/restricted/boost/date_time/CMakeLists.linux-x86_64.txt
index 94835f076a..94835f076a 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/date_time/CMakeLists.txt b/contrib/restricted/boost/date_time/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/describe/CMakeLists.darwin.txt b/contrib/restricted/boost/describe/CMakeLists.darwin-x86_64.txt
index baad9670e4..baad9670e4 100644
--- a/contrib/restricted/boost/describe/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/describe/CMakeLists.linux.txt b/contrib/restricted/boost/describe/CMakeLists.linux-x86_64.txt
index 4cffd37833..4cffd37833 100644
--- a/contrib/restricted/boost/describe/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/describe/CMakeLists.txt b/contrib/restricted/boost/describe/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/describe/CMakeLists.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/detail/CMakeLists.darwin.txt b/contrib/restricted/boost/detail/CMakeLists.darwin-x86_64.txt
index 4100f97935..4100f97935 100644
--- a/contrib/restricted/boost/detail/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/detail/CMakeLists.linux.txt b/contrib/restricted/boost/detail/CMakeLists.linux-x86_64.txt
index a57ff44274..a57ff44274 100644
--- a/contrib/restricted/boost/detail/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/detail/CMakeLists.txt b/contrib/restricted/boost/detail/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/detail/CMakeLists.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin-x86_64.txt
index 8854d288e8..8854d288e8 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux-x86_64.txt
index 1a02ca2150..1a02ca2150 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/endian/CMakeLists.darwin.txt b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt
index ddf28f75fe..ddf28f75fe 100644
--- a/contrib/restricted/boost/endian/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/endian/CMakeLists.linux.txt b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt
index 8a7f037fd7..8a7f037fd7 100644
--- a/contrib/restricted/boost/endian/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/endian/CMakeLists.txt b/contrib/restricted/boost/endian/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/endian/CMakeLists.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/exception/CMakeLists.darwin.txt b/contrib/restricted/boost/exception/CMakeLists.darwin-x86_64.txt
index bd4347f03d..bd4347f03d 100644
--- a/contrib/restricted/boost/exception/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/exception/CMakeLists.linux.txt b/contrib/restricted/boost/exception/CMakeLists.linux-x86_64.txt
index b818e6d085..b818e6d085 100644
--- a/contrib/restricted/boost/exception/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/exception/CMakeLists.txt b/contrib/restricted/boost/exception/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/exception/CMakeLists.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/foreach/CMakeLists.darwin.txt b/contrib/restricted/boost/foreach/CMakeLists.darwin-x86_64.txt
index d2e31c32fc..d2e31c32fc 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/foreach/CMakeLists.linux.txt b/contrib/restricted/boost/foreach/CMakeLists.linux-x86_64.txt
index f1173b51a9..f1173b51a9 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/foreach/CMakeLists.txt b/contrib/restricted/boost/foreach/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/format/CMakeLists.darwin.txt b/contrib/restricted/boost/format/CMakeLists.darwin-x86_64.txt
index 270e92cb48..270e92cb48 100644
--- a/contrib/restricted/boost/format/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/format/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/format/CMakeLists.linux.txt b/contrib/restricted/boost/format/CMakeLists.linux-x86_64.txt
index d19c8b9a86..d19c8b9a86 100644
--- a/contrib/restricted/boost/format/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/format/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/format/CMakeLists.txt b/contrib/restricted/boost/format/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/format/CMakeLists.txt
+++ b/contrib/restricted/boost/format/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/function/CMakeLists.darwin.txt b/contrib/restricted/boost/function/CMakeLists.darwin-x86_64.txt
index 5eed0832c4..5eed0832c4 100644
--- a/contrib/restricted/boost/function/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/function/CMakeLists.linux.txt b/contrib/restricted/boost/function/CMakeLists.linux-x86_64.txt
index a963bc1c02..a963bc1c02 100644
--- a/contrib/restricted/boost/function/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/function/CMakeLists.txt b/contrib/restricted/boost/function/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/function/CMakeLists.txt
+++ b/contrib/restricted/boost/function/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/function_types/CMakeLists.darwin.txt b/contrib/restricted/boost/function_types/CMakeLists.darwin-x86_64.txt
index 2c618a189f..2c618a189f 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/function_types/CMakeLists.linux.txt b/contrib/restricted/boost/function_types/CMakeLists.linux-x86_64.txt
index e128b6adff..e128b6adff 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/function_types/CMakeLists.txt b/contrib/restricted/boost/function_types/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/functional/CMakeLists.darwin.txt b/contrib/restricted/boost/functional/CMakeLists.darwin-x86_64.txt
index 239823acab..239823acab 100644
--- a/contrib/restricted/boost/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/functional/CMakeLists.linux.txt b/contrib/restricted/boost/functional/CMakeLists.linux-x86_64.txt
index baa561be6c..baa561be6c 100644
--- a/contrib/restricted/boost/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/functional/CMakeLists.txt b/contrib/restricted/boost/functional/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/functional/CMakeLists.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/fusion/CMakeLists.darwin.txt b/contrib/restricted/boost/fusion/CMakeLists.darwin-x86_64.txt
index a26f5b12a3..a26f5b12a3 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/fusion/CMakeLists.linux.txt b/contrib/restricted/boost/fusion/CMakeLists.linux-x86_64.txt
index 6540394cad..6540394cad 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/fusion/CMakeLists.txt b/contrib/restricted/boost/fusion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/graph/CMakeLists.darwin.txt b/contrib/restricted/boost/graph/CMakeLists.darwin-x86_64.txt
index 9118ce39b6..9118ce39b6 100644
--- a/contrib/restricted/boost/graph/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/graph/CMakeLists.linux.txt b/contrib/restricted/boost/graph/CMakeLists.linux-x86_64.txt
index fd2c3cf33b..fd2c3cf33b 100644
--- a/contrib/restricted/boost/graph/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/graph/CMakeLists.txt b/contrib/restricted/boost/graph/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/graph/CMakeLists.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/icl/CMakeLists.darwin.txt b/contrib/restricted/boost/icl/CMakeLists.darwin-x86_64.txt
index b6b11aeab9..b6b11aeab9 100644
--- a/contrib/restricted/boost/icl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/icl/CMakeLists.linux.txt b/contrib/restricted/boost/icl/CMakeLists.linux-x86_64.txt
index 9f4aa50c8f..9f4aa50c8f 100644
--- a/contrib/restricted/boost/icl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/icl/CMakeLists.txt b/contrib/restricted/boost/icl/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/icl/CMakeLists.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/integer/CMakeLists.darwin.txt b/contrib/restricted/boost/integer/CMakeLists.darwin-x86_64.txt
index b8189c5a7a..b8189c5a7a 100644
--- a/contrib/restricted/boost/integer/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/integer/CMakeLists.linux.txt b/contrib/restricted/boost/integer/CMakeLists.linux-x86_64.txt
index 6fad3b6c9e..6fad3b6c9e 100644
--- a/contrib/restricted/boost/integer/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/integer/CMakeLists.txt b/contrib/restricted/boost/integer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/integer/CMakeLists.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt b/contrib/restricted/boost/interprocess/CMakeLists.darwin-x86_64.txt
index f95f9fc6c9..f95f9fc6c9 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt b/contrib/restricted/boost/interprocess/CMakeLists.linux-x86_64.txt
index 75abc5bc49..75abc5bc49 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.txt b/contrib/restricted/boost/interprocess/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.darwin.txt b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
index 261b65dc85..261b65dc85 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.linux.txt b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
index 0f15706c63..0f15706c63 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.txt b/contrib/restricted/boost/intrusive/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/io/CMakeLists.darwin.txt b/contrib/restricted/boost/io/CMakeLists.darwin-x86_64.txt
index 4aeba3ef01..4aeba3ef01 100644
--- a/contrib/restricted/boost/io/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/io/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/io/CMakeLists.linux.txt b/contrib/restricted/boost/io/CMakeLists.linux-x86_64.txt
index c7e646dfef..c7e646dfef 100644
--- a/contrib/restricted/boost/io/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/io/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/io/CMakeLists.txt b/contrib/restricted/boost/io/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/io/CMakeLists.txt
+++ b/contrib/restricted/boost/io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt b/contrib/restricted/boost/iostreams/CMakeLists.darwin-x86_64.txt
index ecd5b2a38d..ecd5b2a38d 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt b/contrib/restricted/boost/iostreams/CMakeLists.linux-x86_64.txt
index 1d1e246dae..1d1e246dae 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.txt b/contrib/restricted/boost/iostreams/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/iterator/CMakeLists.darwin.txt b/contrib/restricted/boost/iterator/CMakeLists.darwin-x86_64.txt
index df59b473b2..df59b473b2 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/iterator/CMakeLists.linux.txt b/contrib/restricted/boost/iterator/CMakeLists.linux-x86_64.txt
index a1ebd81a38..a1ebd81a38 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/iterator/CMakeLists.txt b/contrib/restricted/boost/iterator/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/lambda/CMakeLists.darwin.txt b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt
index f3556a1958..f3556a1958 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/lambda/CMakeLists.linux.txt b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt
index ba6f725ead..ba6f725ead 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/lambda/CMakeLists.txt b/contrib/restricted/boost/lambda/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin-x86_64.txt
index c4aff4db0d..c4aff4db0d 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-x86_64.txt
index d746f22bef..d746f22bef 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/locale/CMakeLists.darwin.txt b/contrib/restricted/boost/locale/CMakeLists.darwin-x86_64.txt
index 8e8b149e50..8e8b149e50 100644
--- a/contrib/restricted/boost/locale/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/locale/CMakeLists.linux.txt b/contrib/restricted/boost/locale/CMakeLists.linux-x86_64.txt
index 831330fafc..831330fafc 100644
--- a/contrib/restricted/boost/locale/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/locale/CMakeLists.txt b/contrib/restricted/boost/locale/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/locale/CMakeLists.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/math/CMakeLists.darwin.txt b/contrib/restricted/boost/math/CMakeLists.darwin-x86_64.txt
index 71d5facb39..71d5facb39 100644
--- a/contrib/restricted/boost/math/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/math/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/math/CMakeLists.linux.txt b/contrib/restricted/boost/math/CMakeLists.linux-x86_64.txt
index b8ed0bead8..b8ed0bead8 100644
--- a/contrib/restricted/boost/math/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/math/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/math/CMakeLists.txt b/contrib/restricted/boost/math/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/math/CMakeLists.txt
+++ b/contrib/restricted/boost/math/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/move/CMakeLists.darwin.txt b/contrib/restricted/boost/move/CMakeLists.darwin-x86_64.txt
index 37a8b34d94..37a8b34d94 100644
--- a/contrib/restricted/boost/move/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/move/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/move/CMakeLists.linux.txt b/contrib/restricted/boost/move/CMakeLists.linux-x86_64.txt
index d2a4daa075..d2a4daa075 100644
--- a/contrib/restricted/boost/move/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/move/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/move/CMakeLists.txt b/contrib/restricted/boost/move/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/move/CMakeLists.txt
+++ b/contrib/restricted/boost/move/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt b/contrib/restricted/boost/mp11/CMakeLists.darwin-x86_64.txt
index 7100a8f570..7100a8f570 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/mp11/CMakeLists.linux.txt b/contrib/restricted/boost/mp11/CMakeLists.linux-x86_64.txt
index 88c153c72c..88c153c72c 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/mp11/CMakeLists.txt b/contrib/restricted/boost/mp11/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/mpl/CMakeLists.darwin.txt b/contrib/restricted/boost/mpl/CMakeLists.darwin-x86_64.txt
index 8b161d3adf..8b161d3adf 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/mpl/CMakeLists.linux.txt b/contrib/restricted/boost/mpl/CMakeLists.linux-x86_64.txt
index 2a2813d50c..2a2813d50c 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/mpl/CMakeLists.txt b/contrib/restricted/boost/mpl/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_array/CMakeLists.darwin-x86_64.txt
index 0f36dd5b20..0f36dd5b20 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.linux.txt b/contrib/restricted/boost/multi_array/CMakeLists.linux-x86_64.txt
index a9bf7bfcb3..a9bf7bfcb3 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.txt b/contrib/restricted/boost/multi_array/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_index/CMakeLists.darwin-x86_64.txt
index e8f6c61e6e..e8f6c61e6e 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt b/contrib/restricted/boost/multi_index/CMakeLists.linux-x86_64.txt
index fb769ceb01..fb769ceb01 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.txt b/contrib/restricted/boost/multi_index/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin-x86_64.txt
index c4797132e9..c4797132e9 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.linux.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.linux-x86_64.txt
index 46d33c5f9d..46d33c5f9d 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/optional/CMakeLists.darwin.txt b/contrib/restricted/boost/optional/CMakeLists.darwin-x86_64.txt
index b94f64d5c4..b94f64d5c4 100644
--- a/contrib/restricted/boost/optional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/optional/CMakeLists.linux.txt b/contrib/restricted/boost/optional/CMakeLists.linux-x86_64.txt
index 0bf5a6292d..0bf5a6292d 100644
--- a/contrib/restricted/boost/optional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/optional/CMakeLists.txt b/contrib/restricted/boost/optional/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/optional/CMakeLists.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt b/contrib/restricted/boost/parameter/CMakeLists.darwin-x86_64.txt
index 7aad728341..7aad728341 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/parameter/CMakeLists.linux.txt b/contrib/restricted/boost/parameter/CMakeLists.linux-x86_64.txt
index d5bb0e8b6e..d5bb0e8b6e 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/parameter/CMakeLists.txt b/contrib/restricted/boost/parameter/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.darwin.txt b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt
index 7bf8181aa5..7bf8181aa5 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.linux.txt b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt
index 80062339a3..80062339a3 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.txt b/contrib/restricted/boost/phoenix/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/pool/CMakeLists.darwin.txt b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt
index a0e50e5cde..a0e50e5cde 100644
--- a/contrib/restricted/boost/pool/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/pool/CMakeLists.linux.txt b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt
index a5d127cffb..a5d127cffb 100644
--- a/contrib/restricted/boost/pool/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/pool/CMakeLists.txt b/contrib/restricted/boost/pool/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/pool/CMakeLists.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/predef/CMakeLists.darwin.txt b/contrib/restricted/boost/predef/CMakeLists.darwin-x86_64.txt
index c55eab9d0f..c55eab9d0f 100644
--- a/contrib/restricted/boost/predef/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/predef/CMakeLists.linux.txt b/contrib/restricted/boost/predef/CMakeLists.linux-x86_64.txt
index a0087e3f0d..a0087e3f0d 100644
--- a/contrib/restricted/boost/predef/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/predef/CMakeLists.txt b/contrib/restricted/boost/predef/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/predef/CMakeLists.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.darwin.txt b/contrib/restricted/boost/preprocessor/CMakeLists.darwin-x86_64.txt
index 7df51769d9..7df51769d9 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.linux.txt b/contrib/restricted/boost/preprocessor/CMakeLists.linux-x86_64.txt
index e6e835b5ad..e6e835b5ad 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.txt b/contrib/restricted/boost/preprocessor/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/program_options/CMakeLists.darwin.txt b/contrib/restricted/boost/program_options/CMakeLists.darwin-x86_64.txt
index c91dfc15c5..c91dfc15c5 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/program_options/CMakeLists.linux.txt b/contrib/restricted/boost/program_options/CMakeLists.linux-x86_64.txt
index 1bd268a977..1bd268a977 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/program_options/CMakeLists.txt b/contrib/restricted/boost/program_options/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt b/contrib/restricted/boost/property_map/CMakeLists.darwin-x86_64.txt
index d49456c891..d49456c891 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/property_map/CMakeLists.linux.txt b/contrib/restricted/boost/property_map/CMakeLists.linux-x86_64.txt
index cfb3bee945..cfb3bee945 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/property_map/CMakeLists.txt b/contrib/restricted/boost/property_map/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.darwin.txt b/contrib/restricted/boost/property_tree/CMakeLists.darwin-x86_64.txt
index 57f107d22d..57f107d22d 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.linux.txt b/contrib/restricted/boost/property_tree/CMakeLists.linux-x86_64.txt
index b64b977a64..b64b977a64 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.txt b/contrib/restricted/boost/property_tree/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/proto/CMakeLists.darwin.txt b/contrib/restricted/boost/proto/CMakeLists.darwin-x86_64.txt
index 370165e4ff..370165e4ff 100644
--- a/contrib/restricted/boost/proto/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/proto/CMakeLists.linux.txt b/contrib/restricted/boost/proto/CMakeLists.linux-x86_64.txt
index 8fa3b296b2..8fa3b296b2 100644
--- a/contrib/restricted/boost/proto/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/proto/CMakeLists.txt b/contrib/restricted/boost/proto/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/proto/CMakeLists.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/random/CMakeLists.darwin.txt b/contrib/restricted/boost/random/CMakeLists.darwin-x86_64.txt
index 647aa94668..647aa94668 100644
--- a/contrib/restricted/boost/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/random/CMakeLists.linux.txt b/contrib/restricted/boost/random/CMakeLists.linux-x86_64.txt
index 23ae6c6152..23ae6c6152 100644
--- a/contrib/restricted/boost/random/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/random/CMakeLists.txt b/contrib/restricted/boost/random/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/random/CMakeLists.txt
+++ b/contrib/restricted/boost/random/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/range/CMakeLists.darwin.txt b/contrib/restricted/boost/range/CMakeLists.darwin-x86_64.txt
index eadd2f290c..eadd2f290c 100644
--- a/contrib/restricted/boost/range/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/range/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/range/CMakeLists.linux.txt b/contrib/restricted/boost/range/CMakeLists.linux-x86_64.txt
index a97889d7f6..a97889d7f6 100644
--- a/contrib/restricted/boost/range/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/range/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/range/CMakeLists.txt b/contrib/restricted/boost/range/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/range/CMakeLists.txt
+++ b/contrib/restricted/boost/range/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/ratio/CMakeLists.darwin.txt b/contrib/restricted/boost/ratio/CMakeLists.darwin-x86_64.txt
index 7171c49b08..7171c49b08 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/ratio/CMakeLists.linux.txt b/contrib/restricted/boost/ratio/CMakeLists.linux-x86_64.txt
index 90cac9ef7a..90cac9ef7a 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/ratio/CMakeLists.txt b/contrib/restricted/boost/ratio/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/rational/CMakeLists.darwin.txt b/contrib/restricted/boost/rational/CMakeLists.darwin-x86_64.txt
index c4d92a21a6..c4d92a21a6 100644
--- a/contrib/restricted/boost/rational/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/rational/CMakeLists.linux.txt b/contrib/restricted/boost/rational/CMakeLists.linux-x86_64.txt
index 61fd5149ab..61fd5149ab 100644
--- a/contrib/restricted/boost/rational/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/rational/CMakeLists.txt b/contrib/restricted/boost/rational/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/rational/CMakeLists.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/regex/CMakeLists.darwin.txt b/contrib/restricted/boost/regex/CMakeLists.darwin-x86_64.txt
index b0c67b4c88..b0c67b4c88 100644
--- a/contrib/restricted/boost/regex/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/regex/CMakeLists.linux.txt b/contrib/restricted/boost/regex/CMakeLists.linux-x86_64.txt
index 554805be78..554805be78 100644
--- a/contrib/restricted/boost/regex/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/regex/CMakeLists.txt b/contrib/restricted/boost/regex/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/regex/CMakeLists.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/serialization/CMakeLists.darwin.txt b/contrib/restricted/boost/serialization/CMakeLists.darwin-x86_64.txt
index 52603eb79d..52603eb79d 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/serialization/CMakeLists.linux.txt b/contrib/restricted/boost/serialization/CMakeLists.linux-x86_64.txt
index 43d01c0ab0..43d01c0ab0 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/serialization/CMakeLists.txt b/contrib/restricted/boost/serialization/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin-x86_64.txt
index e13c238580..e13c238580 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-x86_64.txt
index 1c30f857e3..1c30f857e3 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/spirit/CMakeLists.darwin.txt b/contrib/restricted/boost/spirit/CMakeLists.darwin-x86_64.txt
index 6a804f549d..6a804f549d 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/spirit/CMakeLists.linux.txt b/contrib/restricted/boost/spirit/CMakeLists.linux-x86_64.txt
index 01948379bb..01948379bb 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/spirit/CMakeLists.txt b/contrib/restricted/boost/spirit/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.darwin.txt b/contrib/restricted/boost/static_assert/CMakeLists.darwin-x86_64.txt
index 6506f1babd..6506f1babd 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.linux.txt b/contrib/restricted/boost/static_assert/CMakeLists.linux-x86_64.txt
index efc171911e..efc171911e 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.txt b/contrib/restricted/boost/static_assert/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/system/CMakeLists.darwin.txt b/contrib/restricted/boost/system/CMakeLists.darwin-x86_64.txt
index 49847620cb..49847620cb 100644
--- a/contrib/restricted/boost/system/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/system/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/system/CMakeLists.linux.txt b/contrib/restricted/boost/system/CMakeLists.linux-x86_64.txt
index bb535c4333..bb535c4333 100644
--- a/contrib/restricted/boost/system/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/system/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/system/CMakeLists.txt b/contrib/restricted/boost/system/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/system/CMakeLists.txt
+++ b/contrib/restricted/boost/system/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/thread/CMakeLists.darwin.txt b/contrib/restricted/boost/thread/CMakeLists.darwin-x86_64.txt
index 683da25426..683da25426 100644
--- a/contrib/restricted/boost/thread/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/thread/CMakeLists.linux.txt b/contrib/restricted/boost/thread/CMakeLists.linux-x86_64.txt
index ee0e2e1fcc..ee0e2e1fcc 100644
--- a/contrib/restricted/boost/thread/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/thread/CMakeLists.txt b/contrib/restricted/boost/thread/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/thread/CMakeLists.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.darwin.txt b/contrib/restricted/boost/throw_exception/CMakeLists.darwin-x86_64.txt
index eefa32cee2..eefa32cee2 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.linux.txt b/contrib/restricted/boost/throw_exception/CMakeLists.linux-x86_64.txt
index 105ee3325e..105ee3325e 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.txt b/contrib/restricted/boost/throw_exception/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.darwin.txt b/contrib/restricted/boost/tokenizer/CMakeLists.darwin-x86_64.txt
index 484614506f..484614506f 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.linux.txt b/contrib/restricted/boost/tokenizer/CMakeLists.linux-x86_64.txt
index f150b16ca2..f150b16ca2 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.txt b/contrib/restricted/boost/tokenizer/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tti/CMakeLists.darwin.txt b/contrib/restricted/boost/tti/CMakeLists.darwin-x86_64.txt
index 21cde2d8ba..21cde2d8ba 100644
--- a/contrib/restricted/boost/tti/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tti/CMakeLists.linux.txt b/contrib/restricted/boost/tti/CMakeLists.linux-x86_64.txt
index 9c8dd5bc54..9c8dd5bc54 100644
--- a/contrib/restricted/boost/tti/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tti/CMakeLists.txt b/contrib/restricted/boost/tti/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/tti/CMakeLists.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tuple/CMakeLists.darwin.txt b/contrib/restricted/boost/tuple/CMakeLists.darwin-x86_64.txt
index 35051c1252..35051c1252 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tuple/CMakeLists.linux.txt b/contrib/restricted/boost/tuple/CMakeLists.linux-x86_64.txt
index de83f3637a..de83f3637a 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tuple/CMakeLists.txt b/contrib/restricted/boost/tuple/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt b/contrib/restricted/boost/type_index/CMakeLists.darwin-x86_64.txt
index e6366d2523..e6366d2523 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/type_index/CMakeLists.linux.txt b/contrib/restricted/boost/type_index/CMakeLists.linux-x86_64.txt
index 333b4a45fd..333b4a45fd 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/type_index/CMakeLists.txt b/contrib/restricted/boost/type_index/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt b/contrib/restricted/boost/type_traits/CMakeLists.darwin-x86_64.txt
index a32d4a750e..a32d4a750e 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt b/contrib/restricted/boost/type_traits/CMakeLists.linux-x86_64.txt
index 9771ff8a74..9771ff8a74 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.txt b/contrib/restricted/boost/type_traits/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt b/contrib/restricted/boost/typeof/CMakeLists.darwin-x86_64.txt
index 04fff27108..04fff27108 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/typeof/CMakeLists.linux.txt b/contrib/restricted/boost/typeof/CMakeLists.linux-x86_64.txt
index ff3ee3a266..ff3ee3a266 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/typeof/CMakeLists.txt b/contrib/restricted/boost/typeof/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/unordered/CMakeLists.darwin.txt b/contrib/restricted/boost/unordered/CMakeLists.darwin-x86_64.txt
index 0a1dbba096..0a1dbba096 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/unordered/CMakeLists.linux.txt b/contrib/restricted/boost/unordered/CMakeLists.linux-x86_64.txt
index 2c662b8703..2c662b8703 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/unordered/CMakeLists.txt b/contrib/restricted/boost/unordered/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/utility/CMakeLists.darwin.txt b/contrib/restricted/boost/utility/CMakeLists.darwin-x86_64.txt
index 75fd878529..75fd878529 100644
--- a/contrib/restricted/boost/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/utility/CMakeLists.linux.txt b/contrib/restricted/boost/utility/CMakeLists.linux-x86_64.txt
index a04da10363..a04da10363 100644
--- a/contrib/restricted/boost/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/utility/CMakeLists.txt b/contrib/restricted/boost/utility/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/utility/CMakeLists.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/variant/CMakeLists.darwin.txt b/contrib/restricted/boost/variant/CMakeLists.darwin-x86_64.txt
index 609c9606b8..609c9606b8 100644
--- a/contrib/restricted/boost/variant/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/variant/CMakeLists.linux.txt b/contrib/restricted/boost/variant/CMakeLists.linux-x86_64.txt
index 051a57fd90..051a57fd90 100644
--- a/contrib/restricted/boost/variant/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/variant/CMakeLists.txt b/contrib/restricted/boost/variant/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/variant/CMakeLists.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/variant2/CMakeLists.darwin.txt b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt
index faec5d9097..faec5d9097 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/variant2/CMakeLists.linux.txt b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt
index b3cdd31e10..b3cdd31e10 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/variant2/CMakeLists.txt b/contrib/restricted/boost/variant2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/winapi/CMakeLists.darwin.txt b/contrib/restricted/boost/winapi/CMakeLists.darwin-x86_64.txt
index 13fd04341f..13fd04341f 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/winapi/CMakeLists.linux.txt b/contrib/restricted/boost/winapi/CMakeLists.linux-x86_64.txt
index 08c0809361..08c0809361 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/winapi/CMakeLists.txt b/contrib/restricted/boost/winapi/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.darwin.txt b/contrib/restricted/boost/xpressive/CMakeLists.darwin-x86_64.txt
index d897400340..d897400340 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.linux.txt b/contrib/restricted/boost/xpressive/CMakeLists.linux-x86_64.txt
index ad59415763..ad59415763 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.txt b/contrib/restricted/boost/xpressive/CMakeLists.txt
index 0f8cf0fb16..a603bef54e 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin-x86_64.txt
index d7518da2f4..d7518da2f4 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin.txt
+++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.linux.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.linux-x86_64.txt
index 1abb1abf0a..1abb1abf0a 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.linux.txt
+++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/cityhash-1.0.2/CMakeLists.txt
+++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/dragonbox/CMakeLists.darwin.txt b/contrib/restricted/dragonbox/CMakeLists.darwin-x86_64.txt
index 4e0fcd5b99..4e0fcd5b99 100644
--- a/contrib/restricted/dragonbox/CMakeLists.darwin.txt
+++ b/contrib/restricted/dragonbox/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/dragonbox/CMakeLists.linux.txt b/contrib/restricted/dragonbox/CMakeLists.linux-x86_64.txt
index 83a5cfb37c..83a5cfb37c 100644
--- a/contrib/restricted/dragonbox/CMakeLists.linux.txt
+++ b/contrib/restricted/dragonbox/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/dragonbox/CMakeLists.txt b/contrib/restricted/dragonbox/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/dragonbox/CMakeLists.txt
+++ b/contrib/restricted/dragonbox/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/fast_float/CMakeLists.darwin.txt b/contrib/restricted/fast_float/CMakeLists.darwin-x86_64.txt
index 277929ec2e..277929ec2e 100644
--- a/contrib/restricted/fast_float/CMakeLists.darwin.txt
+++ b/contrib/restricted/fast_float/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/fast_float/CMakeLists.linux.txt b/contrib/restricted/fast_float/CMakeLists.linux-x86_64.txt
index 4541d2ed55..4541d2ed55 100644
--- a/contrib/restricted/fast_float/CMakeLists.linux.txt
+++ b/contrib/restricted/fast_float/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/fast_float/CMakeLists.txt b/contrib/restricted/fast_float/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/fast_float/CMakeLists.txt
+++ b/contrib/restricted/fast_float/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.darwin.txt b/contrib/restricted/googletest/googlemock/CMakeLists.darwin-x86_64.txt
index 01df6b6ce7..01df6b6ce7 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.darwin.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.linux.txt b/contrib/restricted/googletest/googlemock/CMakeLists.linux-x86_64.txt
index d500700c45..d500700c45 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.linux.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.txt b/contrib/restricted/googletest/googlemock/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.darwin.txt b/contrib/restricted/googletest/googletest/CMakeLists.darwin-x86_64.txt
index b28f00772f..b28f00772f 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.darwin.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.linux.txt b/contrib/restricted/googletest/googletest/CMakeLists.linux-x86_64.txt
index b04078314e..b04078314e 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.linux.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.txt b/contrib/restricted/googletest/googletest/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/nlohmann_json/CMakeLists.darwin.txt b/contrib/restricted/nlohmann_json/CMakeLists.darwin-x86_64.txt
index 0c96110bcc..0c96110bcc 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.darwin.txt
+++ b/contrib/restricted/nlohmann_json/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/nlohmann_json/CMakeLists.linux.txt b/contrib/restricted/nlohmann_json/CMakeLists.linux-x86_64.txt
index 2641b31de2..2641b31de2 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.linux.txt
+++ b/contrib/restricted/nlohmann_json/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/nlohmann_json/CMakeLists.txt b/contrib/restricted/nlohmann_json/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/nlohmann_json/CMakeLists.txt
+++ b/contrib/restricted/nlohmann_json/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/thrift/CMakeLists.darwin.txt b/contrib/restricted/thrift/CMakeLists.darwin-x86_64.txt
index fcff6a7639..fcff6a7639 100644
--- a/contrib/restricted/thrift/CMakeLists.darwin.txt
+++ b/contrib/restricted/thrift/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/thrift/CMakeLists.linux.txt b/contrib/restricted/thrift/CMakeLists.linux-x86_64.txt
index daee3f2fa4..daee3f2fa4 100644
--- a/contrib/restricted/thrift/CMakeLists.linux.txt
+++ b/contrib/restricted/thrift/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/thrift/CMakeLists.txt b/contrib/restricted/thrift/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/thrift/CMakeLists.txt
+++ b/contrib/restricted/thrift/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/uriparser/CMakeLists.darwin.txt b/contrib/restricted/uriparser/CMakeLists.darwin-x86_64.txt
index 2163bfff7c..2163bfff7c 100644
--- a/contrib/restricted/uriparser/CMakeLists.darwin.txt
+++ b/contrib/restricted/uriparser/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/uriparser/CMakeLists.linux.txt b/contrib/restricted/uriparser/CMakeLists.linux-x86_64.txt
index ef48e97a88..ef48e97a88 100644
--- a/contrib/restricted/uriparser/CMakeLists.linux.txt
+++ b/contrib/restricted/uriparser/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/uriparser/CMakeLists.txt b/contrib/restricted/uriparser/CMakeLists.txt
index eee324bb60..8f8c04afe5 100644
--- a/contrib/restricted/uriparser/CMakeLists.txt
+++ b/contrib/restricted/uriparser/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()