Intermediate changes

255 files changed, 170 insertions, 170 deletions

diff --git a/contrib/restricted/boost/CMakeLists.darwin.txt b/contrib/restricted/boost/CMakeLists.darwin-x86_64.txt
index 2ce12f636b3..2ce12f636b3 100644
--- a/contrib/restricted/boost/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/CMakeLists.linux.txt b/contrib/restricted/boost/CMakeLists.linux-x86_64.txt
index 2ce12f636b3..2ce12f636b3 100644
--- a/contrib/restricted/boost/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/CMakeLists.txt b/contrib/restricted/boost/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/CMakeLists.txt
+++ b/contrib/restricted/boost/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.darwin.txt b/contrib/restricted/boost/algorithm/CMakeLists.darwin-x86_64.txt
index 7601e49d0f9..7601e49d0f9 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.linux.txt b/contrib/restricted/boost/algorithm/CMakeLists.linux-x86_64.txt
index ded7dbfbd84..ded7dbfbd84 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/algorithm/CMakeLists.txt b/contrib/restricted/boost/algorithm/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/algorithm/CMakeLists.txt
+++ b/contrib/restricted/boost/algorithm/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/align/CMakeLists.darwin.txt b/contrib/restricted/boost/align/CMakeLists.darwin-x86_64.txt
index b4f255a0c6e..b4f255a0c6e 100644
--- a/contrib/restricted/boost/align/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/align/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/align/CMakeLists.linux.txt b/contrib/restricted/boost/align/CMakeLists.linux-x86_64.txt
index e032aaa404e..e032aaa404e 100644
--- a/contrib/restricted/boost/align/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/align/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/align/CMakeLists.txt b/contrib/restricted/boost/align/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/align/CMakeLists.txt
+++ b/contrib/restricted/boost/align/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/any/CMakeLists.darwin.txt b/contrib/restricted/boost/any/CMakeLists.darwin-x86_64.txt
index 946a109665e..946a109665e 100644
--- a/contrib/restricted/boost/any/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/any/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/any/CMakeLists.linux.txt b/contrib/restricted/boost/any/CMakeLists.linux-x86_64.txt
index b1d48450502..b1d48450502 100644
--- a/contrib/restricted/boost/any/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/any/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/any/CMakeLists.txt b/contrib/restricted/boost/any/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/any/CMakeLists.txt
+++ b/contrib/restricted/boost/any/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/array/CMakeLists.darwin.txt b/contrib/restricted/boost/array/CMakeLists.darwin-x86_64.txt
index f640cbf516c..f640cbf516c 100644
--- a/contrib/restricted/boost/array/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/array/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/array/CMakeLists.linux.txt b/contrib/restricted/boost/array/CMakeLists.linux-x86_64.txt
index 157f171696e..157f171696e 100644
--- a/contrib/restricted/boost/array/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/array/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/array/CMakeLists.txt b/contrib/restricted/boost/array/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/array/CMakeLists.txt
+++ b/contrib/restricted/boost/array/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/asio/CMakeLists.darwin.txt b/contrib/restricted/boost/asio/CMakeLists.darwin-x86_64.txt
index 74b17e3e1bd..74b17e3e1bd 100644
--- a/contrib/restricted/boost/asio/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/asio/CMakeLists.linux.txt b/contrib/restricted/boost/asio/CMakeLists.linux-x86_64.txt
index 0108378f15f..0108378f15f 100644
--- a/contrib/restricted/boost/asio/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/asio/CMakeLists.txt b/contrib/restricted/boost/asio/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/asio/CMakeLists.txt
+++ b/contrib/restricted/boost/asio/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/assert/CMakeLists.darwin.txt b/contrib/restricted/boost/assert/CMakeLists.darwin-x86_64.txt
index 0ba173db4f8..0ba173db4f8 100644
--- a/contrib/restricted/boost/assert/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/assert/CMakeLists.linux.txt b/contrib/restricted/boost/assert/CMakeLists.linux-x86_64.txt
index bd55d5ef619..bd55d5ef619 100644
--- a/contrib/restricted/boost/assert/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/assert/CMakeLists.txt b/contrib/restricted/boost/assert/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/assert/CMakeLists.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/atomic/CMakeLists.darwin.txt b/contrib/restricted/boost/atomic/CMakeLists.darwin-x86_64.txt
index c7c24c5a0f0..c7c24c5a0f0 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/atomic/CMakeLists.linux.txt b/contrib/restricted/boost/atomic/CMakeLists.linux-x86_64.txt
index 5f830a8cfa8..5f830a8cfa8 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/atomic/CMakeLists.txt b/contrib/restricted/boost/atomic/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt
index c44e09b7d6f..c44e09b7d6f 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/bimap/CMakeLists.linux.txt b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt
index ec170e9cbc8..ec170e9cbc8 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/bimap/CMakeLists.txt b/contrib/restricted/boost/bimap/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/bind/CMakeLists.darwin.txt b/contrib/restricted/boost/bind/CMakeLists.darwin-x86_64.txt
index 88c5f9bf7b9..88c5f9bf7b9 100644
--- a/contrib/restricted/boost/bind/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/bind/CMakeLists.linux.txt b/contrib/restricted/boost/bind/CMakeLists.linux-x86_64.txt
index d77d1b474b9..d77d1b474b9 100644
--- a/contrib/restricted/boost/bind/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/bind/CMakeLists.txt b/contrib/restricted/boost/bind/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/bind/CMakeLists.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/chrono/CMakeLists.darwin.txt b/contrib/restricted/boost/chrono/CMakeLists.darwin-x86_64.txt
index af74091cab5..af74091cab5 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/chrono/CMakeLists.linux.txt b/contrib/restricted/boost/chrono/CMakeLists.linux-x86_64.txt
index 849cd7c2154..849cd7c2154 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/chrono/CMakeLists.txt b/contrib/restricted/boost/chrono/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/chrono/CMakeLists.txt
+++ b/contrib/restricted/boost/chrono/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt b/contrib/restricted/boost/concept_check/CMakeLists.darwin-x86_64.txt
index 4bea4830c41..4bea4830c41 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt b/contrib/restricted/boost/concept_check/CMakeLists.linux-x86_64.txt
index e2b6d7b8684..e2b6d7b8684 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.txt b/contrib/restricted/boost/concept_check/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/config/CMakeLists.darwin.txt b/contrib/restricted/boost/config/CMakeLists.darwin-x86_64.txt
index b3623a130d7..b3623a130d7 100644
--- a/contrib/restricted/boost/config/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/config/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/config/CMakeLists.linux.txt b/contrib/restricted/boost/config/CMakeLists.linux-x86_64.txt
index 5bebf20e986..5bebf20e986 100644
--- a/contrib/restricted/boost/config/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/config/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/config/CMakeLists.txt b/contrib/restricted/boost/config/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/config/CMakeLists.txt
+++ b/contrib/restricted/boost/config/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/container/CMakeLists.darwin.txt b/contrib/restricted/boost/container/CMakeLists.darwin-x86_64.txt
index 74ef11ce7c5..74ef11ce7c5 100644
--- a/contrib/restricted/boost/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/container/CMakeLists.linux.txt b/contrib/restricted/boost/container/CMakeLists.linux-x86_64.txt
index 8478a2b4757..8478a2b4757 100644
--- a/contrib/restricted/boost/container/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/container/CMakeLists.txt b/contrib/restricted/boost/container/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/container/CMakeLists.txt
+++ b/contrib/restricted/boost/container/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.darwin.txt b/contrib/restricted/boost/container_hash/CMakeLists.darwin-x86_64.txt
index f6ba33a6e96..f6ba33a6e96 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.linux.txt b/contrib/restricted/boost/container_hash/CMakeLists.linux-x86_64.txt
index 0e9a7fc3901..0e9a7fc3901 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.txt b/contrib/restricted/boost/container_hash/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin-x86_64.txt
index d5301afd155..d5301afd155 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux-x86_64.txt
index 21ce313ed96..21ce313ed96 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
+++ b/contrib/restricted/boost/context/fcontext_impl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin-x86_64.txt
index 100cd01a5d6..100cd01a5d6 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-x86_64.txt
index 06f9049883d..06f9049883d 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/conversion/CMakeLists.darwin.txt b/contrib/restricted/boost/conversion/CMakeLists.darwin-x86_64.txt
index f1a53fd123f..f1a53fd123f 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/conversion/CMakeLists.linux.txt b/contrib/restricted/boost/conversion/CMakeLists.linux-x86_64.txt
index ccc6337d05c..ccc6337d05c 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/conversion/CMakeLists.txt b/contrib/restricted/boost/conversion/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/core/CMakeLists.darwin.txt b/contrib/restricted/boost/core/CMakeLists.darwin-x86_64.txt
index 8b4b0f15dad..8b4b0f15dad 100644
--- a/contrib/restricted/boost/core/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/core/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/core/CMakeLists.linux.txt b/contrib/restricted/boost/core/CMakeLists.linux-x86_64.txt
index 9a1bc627069..9a1bc627069 100644
--- a/contrib/restricted/boost/core/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/core/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/core/CMakeLists.txt b/contrib/restricted/boost/core/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/core/CMakeLists.txt
+++ b/contrib/restricted/boost/core/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt b/contrib/restricted/boost/coroutine/CMakeLists.darwin-x86_64.txt
index 078b319b347..078b319b347 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt b/contrib/restricted/boost/coroutine/CMakeLists.linux-x86_64.txt
index d91726a632b..d91726a632b 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.txt b/contrib/restricted/boost/coroutine/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/crc/CMakeLists.darwin.txt b/contrib/restricted/boost/crc/CMakeLists.darwin-x86_64.txt
index 2730ce7c010..2730ce7c010 100644
--- a/contrib/restricted/boost/crc/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/crc/CMakeLists.linux.txt b/contrib/restricted/boost/crc/CMakeLists.linux-x86_64.txt
index 6473832eb12..6473832eb12 100644
--- a/contrib/restricted/boost/crc/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/crc/CMakeLists.txt b/contrib/restricted/boost/crc/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/crc/CMakeLists.txt
+++ b/contrib/restricted/boost/crc/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt b/contrib/restricted/boost/date_time/CMakeLists.darwin-x86_64.txt
index da90148a57a..da90148a57a 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/date_time/CMakeLists.linux.txt b/contrib/restricted/boost/date_time/CMakeLists.linux-x86_64.txt
index 94835f076ab..94835f076ab 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/date_time/CMakeLists.txt b/contrib/restricted/boost/date_time/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/describe/CMakeLists.darwin.txt b/contrib/restricted/boost/describe/CMakeLists.darwin-x86_64.txt
index baad9670e4b..baad9670e4b 100644
--- a/contrib/restricted/boost/describe/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/describe/CMakeLists.linux.txt b/contrib/restricted/boost/describe/CMakeLists.linux-x86_64.txt
index 4cffd37833f..4cffd37833f 100644
--- a/contrib/restricted/boost/describe/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/describe/CMakeLists.txt b/contrib/restricted/boost/describe/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/describe/CMakeLists.txt
+++ b/contrib/restricted/boost/describe/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/detail/CMakeLists.darwin.txt b/contrib/restricted/boost/detail/CMakeLists.darwin-x86_64.txt
index 4100f97935c..4100f97935c 100644
--- a/contrib/restricted/boost/detail/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/detail/CMakeLists.linux.txt b/contrib/restricted/boost/detail/CMakeLists.linux-x86_64.txt
index a57ff442744..a57ff442744 100644
--- a/contrib/restricted/boost/detail/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/detail/CMakeLists.txt b/contrib/restricted/boost/detail/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/detail/CMakeLists.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin-x86_64.txt
index 8854d288e8e..8854d288e8e 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux-x86_64.txt
index 1a02ca21502..1a02ca21502 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/endian/CMakeLists.darwin.txt b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt
index ddf28f75fe4..ddf28f75fe4 100644
--- a/contrib/restricted/boost/endian/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/endian/CMakeLists.linux.txt b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt
index 8a7f037fd78..8a7f037fd78 100644
--- a/contrib/restricted/boost/endian/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/endian/CMakeLists.txt b/contrib/restricted/boost/endian/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/endian/CMakeLists.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/exception/CMakeLists.darwin.txt b/contrib/restricted/boost/exception/CMakeLists.darwin-x86_64.txt
index bd4347f03d4..bd4347f03d4 100644
--- a/contrib/restricted/boost/exception/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/exception/CMakeLists.linux.txt b/contrib/restricted/boost/exception/CMakeLists.linux-x86_64.txt
index b818e6d085c..b818e6d085c 100644
--- a/contrib/restricted/boost/exception/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/exception/CMakeLists.txt b/contrib/restricted/boost/exception/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/exception/CMakeLists.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/foreach/CMakeLists.darwin.txt b/contrib/restricted/boost/foreach/CMakeLists.darwin-x86_64.txt
index d2e31c32fc8..d2e31c32fc8 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/foreach/CMakeLists.linux.txt b/contrib/restricted/boost/foreach/CMakeLists.linux-x86_64.txt
index f1173b51a9d..f1173b51a9d 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/foreach/CMakeLists.txt b/contrib/restricted/boost/foreach/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/format/CMakeLists.darwin.txt b/contrib/restricted/boost/format/CMakeLists.darwin-x86_64.txt
index 270e92cb48f..270e92cb48f 100644
--- a/contrib/restricted/boost/format/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/format/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/format/CMakeLists.linux.txt b/contrib/restricted/boost/format/CMakeLists.linux-x86_64.txt
index d19c8b9a869..d19c8b9a869 100644
--- a/contrib/restricted/boost/format/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/format/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/format/CMakeLists.txt b/contrib/restricted/boost/format/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/format/CMakeLists.txt
+++ b/contrib/restricted/boost/format/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/function/CMakeLists.darwin.txt b/contrib/restricted/boost/function/CMakeLists.darwin-x86_64.txt
index 5eed0832c43..5eed0832c43 100644
--- a/contrib/restricted/boost/function/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/function/CMakeLists.linux.txt b/contrib/restricted/boost/function/CMakeLists.linux-x86_64.txt
index a963bc1c023..a963bc1c023 100644
--- a/contrib/restricted/boost/function/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/function/CMakeLists.txt b/contrib/restricted/boost/function/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/function/CMakeLists.txt
+++ b/contrib/restricted/boost/function/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/function_types/CMakeLists.darwin.txt b/contrib/restricted/boost/function_types/CMakeLists.darwin-x86_64.txt
index 2c618a189f3..2c618a189f3 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/function_types/CMakeLists.linux.txt b/contrib/restricted/boost/function_types/CMakeLists.linux-x86_64.txt
index e128b6adffc..e128b6adffc 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/function_types/CMakeLists.txt b/contrib/restricted/boost/function_types/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/functional/CMakeLists.darwin.txt b/contrib/restricted/boost/functional/CMakeLists.darwin-x86_64.txt
index 239823acab2..239823acab2 100644
--- a/contrib/restricted/boost/functional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/functional/CMakeLists.linux.txt b/contrib/restricted/boost/functional/CMakeLists.linux-x86_64.txt
index baa561be6c3..baa561be6c3 100644
--- a/contrib/restricted/boost/functional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/functional/CMakeLists.txt b/contrib/restricted/boost/functional/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/functional/CMakeLists.txt
+++ b/contrib/restricted/boost/functional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/fusion/CMakeLists.darwin.txt b/contrib/restricted/boost/fusion/CMakeLists.darwin-x86_64.txt
index a26f5b12a3e..a26f5b12a3e 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/fusion/CMakeLists.linux.txt b/contrib/restricted/boost/fusion/CMakeLists.linux-x86_64.txt
index 6540394cad6..6540394cad6 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/fusion/CMakeLists.txt b/contrib/restricted/boost/fusion/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/graph/CMakeLists.darwin.txt b/contrib/restricted/boost/graph/CMakeLists.darwin-x86_64.txt
index 9118ce39b67..9118ce39b67 100644
--- a/contrib/restricted/boost/graph/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/graph/CMakeLists.linux.txt b/contrib/restricted/boost/graph/CMakeLists.linux-x86_64.txt
index fd2c3cf33bc..fd2c3cf33bc 100644
--- a/contrib/restricted/boost/graph/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/graph/CMakeLists.txt b/contrib/restricted/boost/graph/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/graph/CMakeLists.txt
+++ b/contrib/restricted/boost/graph/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/icl/CMakeLists.darwin.txt b/contrib/restricted/boost/icl/CMakeLists.darwin-x86_64.txt
index b6b11aeab90..b6b11aeab90 100644
--- a/contrib/restricted/boost/icl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/icl/CMakeLists.linux.txt b/contrib/restricted/boost/icl/CMakeLists.linux-x86_64.txt
index 9f4aa50c8fb..9f4aa50c8fb 100644
--- a/contrib/restricted/boost/icl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/icl/CMakeLists.txt b/contrib/restricted/boost/icl/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/icl/CMakeLists.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/integer/CMakeLists.darwin.txt b/contrib/restricted/boost/integer/CMakeLists.darwin-x86_64.txt
index b8189c5a7a9..b8189c5a7a9 100644
--- a/contrib/restricted/boost/integer/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/integer/CMakeLists.linux.txt b/contrib/restricted/boost/integer/CMakeLists.linux-x86_64.txt
index 6fad3b6c9ed..6fad3b6c9ed 100644
--- a/contrib/restricted/boost/integer/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/integer/CMakeLists.txt b/contrib/restricted/boost/integer/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/integer/CMakeLists.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt b/contrib/restricted/boost/interprocess/CMakeLists.darwin-x86_64.txt
index f95f9fc6c9f..f95f9fc6c9f 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt b/contrib/restricted/boost/interprocess/CMakeLists.linux-x86_64.txt
index 75abc5bc492..75abc5bc492 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.txt b/contrib/restricted/boost/interprocess/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.darwin.txt b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
index 261b65dc857..261b65dc857 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.linux.txt b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
index 0f15706c633..0f15706c633 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.txt b/contrib/restricted/boost/intrusive/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/io/CMakeLists.darwin.txt b/contrib/restricted/boost/io/CMakeLists.darwin-x86_64.txt
index 4aeba3ef014..4aeba3ef014 100644
--- a/contrib/restricted/boost/io/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/io/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/io/CMakeLists.linux.txt b/contrib/restricted/boost/io/CMakeLists.linux-x86_64.txt
index c7e646dfef9..c7e646dfef9 100644
--- a/contrib/restricted/boost/io/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/io/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/io/CMakeLists.txt b/contrib/restricted/boost/io/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/io/CMakeLists.txt
+++ b/contrib/restricted/boost/io/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt b/contrib/restricted/boost/iostreams/CMakeLists.darwin-x86_64.txt
index ecd5b2a38d1..ecd5b2a38d1 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt b/contrib/restricted/boost/iostreams/CMakeLists.linux-x86_64.txt
index 1d1e246daee..1d1e246daee 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.txt b/contrib/restricted/boost/iostreams/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/iterator/CMakeLists.darwin.txt b/contrib/restricted/boost/iterator/CMakeLists.darwin-x86_64.txt
index df59b473b28..df59b473b28 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/iterator/CMakeLists.linux.txt b/contrib/restricted/boost/iterator/CMakeLists.linux-x86_64.txt
index a1ebd81a38f..a1ebd81a38f 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/iterator/CMakeLists.txt b/contrib/restricted/boost/iterator/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/lambda/CMakeLists.darwin.txt b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt
index f3556a1958e..f3556a1958e 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/lambda/CMakeLists.linux.txt b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt
index ba6f725eadb..ba6f725eadb 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/lambda/CMakeLists.txt b/contrib/restricted/boost/lambda/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin-x86_64.txt
index c4aff4db0d5..c4aff4db0d5 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-x86_64.txt
index d746f22befe..d746f22befe 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/locale/CMakeLists.darwin.txt b/contrib/restricted/boost/locale/CMakeLists.darwin-x86_64.txt
index 8e8b149e509..8e8b149e509 100644
--- a/contrib/restricted/boost/locale/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/locale/CMakeLists.linux.txt b/contrib/restricted/boost/locale/CMakeLists.linux-x86_64.txt
index 831330fafc3..831330fafc3 100644
--- a/contrib/restricted/boost/locale/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/locale/CMakeLists.txt b/contrib/restricted/boost/locale/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/locale/CMakeLists.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/math/CMakeLists.darwin.txt b/contrib/restricted/boost/math/CMakeLists.darwin-x86_64.txt
index 71d5facb39e..71d5facb39e 100644
--- a/contrib/restricted/boost/math/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/math/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/math/CMakeLists.linux.txt b/contrib/restricted/boost/math/CMakeLists.linux-x86_64.txt
index b8ed0bead8b..b8ed0bead8b 100644
--- a/contrib/restricted/boost/math/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/math/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/math/CMakeLists.txt b/contrib/restricted/boost/math/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/math/CMakeLists.txt
+++ b/contrib/restricted/boost/math/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/move/CMakeLists.darwin.txt b/contrib/restricted/boost/move/CMakeLists.darwin-x86_64.txt
index 37a8b34d946..37a8b34d946 100644
--- a/contrib/restricted/boost/move/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/move/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/move/CMakeLists.linux.txt b/contrib/restricted/boost/move/CMakeLists.linux-x86_64.txt
index d2a4daa0759..d2a4daa0759 100644
--- a/contrib/restricted/boost/move/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/move/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/move/CMakeLists.txt b/contrib/restricted/boost/move/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/move/CMakeLists.txt
+++ b/contrib/restricted/boost/move/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt b/contrib/restricted/boost/mp11/CMakeLists.darwin-x86_64.txt
index 7100a8f570d..7100a8f570d 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/mp11/CMakeLists.linux.txt b/contrib/restricted/boost/mp11/CMakeLists.linux-x86_64.txt
index 88c153c72c1..88c153c72c1 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/mp11/CMakeLists.txt b/contrib/restricted/boost/mp11/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/mpl/CMakeLists.darwin.txt b/contrib/restricted/boost/mpl/CMakeLists.darwin-x86_64.txt
index 8b161d3adfd..8b161d3adfd 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/mpl/CMakeLists.linux.txt b/contrib/restricted/boost/mpl/CMakeLists.linux-x86_64.txt
index 2a2813d50c8..2a2813d50c8 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/mpl/CMakeLists.txt b/contrib/restricted/boost/mpl/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_array/CMakeLists.darwin-x86_64.txt
index 0f36dd5b204..0f36dd5b204 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.linux.txt b/contrib/restricted/boost/multi_array/CMakeLists.linux-x86_64.txt
index a9bf7bfcb38..a9bf7bfcb38 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.txt b/contrib/restricted/boost/multi_array/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_index/CMakeLists.darwin-x86_64.txt
index e8f6c61e6e3..e8f6c61e6e3 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt b/contrib/restricted/boost/multi_index/CMakeLists.linux-x86_64.txt
index fb769ceb012..fb769ceb012 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.txt b/contrib/restricted/boost/multi_index/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin-x86_64.txt
index c4797132e9e..c4797132e9e 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.linux.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.linux-x86_64.txt
index 46d33c5f9d4..46d33c5f9d4 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/optional/CMakeLists.darwin.txt b/contrib/restricted/boost/optional/CMakeLists.darwin-x86_64.txt
index b94f64d5c46..b94f64d5c46 100644
--- a/contrib/restricted/boost/optional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/optional/CMakeLists.linux.txt b/contrib/restricted/boost/optional/CMakeLists.linux-x86_64.txt
index 0bf5a6292df..0bf5a6292df 100644
--- a/contrib/restricted/boost/optional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/optional/CMakeLists.txt b/contrib/restricted/boost/optional/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/optional/CMakeLists.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt b/contrib/restricted/boost/parameter/CMakeLists.darwin-x86_64.txt
index 7aad7283416..7aad7283416 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/parameter/CMakeLists.linux.txt b/contrib/restricted/boost/parameter/CMakeLists.linux-x86_64.txt
index d5bb0e8b6e2..d5bb0e8b6e2 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/parameter/CMakeLists.txt b/contrib/restricted/boost/parameter/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.darwin.txt b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt
index 7bf8181aa5e..7bf8181aa5e 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.linux.txt b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt
index 80062339a36..80062339a36 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.txt b/contrib/restricted/boost/phoenix/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/pool/CMakeLists.darwin.txt b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt
index a0e50e5cde2..a0e50e5cde2 100644
--- a/contrib/restricted/boost/pool/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/pool/CMakeLists.linux.txt b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt
index a5d127cffbf..a5d127cffbf 100644
--- a/contrib/restricted/boost/pool/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/pool/CMakeLists.txt b/contrib/restricted/boost/pool/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/pool/CMakeLists.txt
+++ b/contrib/restricted/boost/pool/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/predef/CMakeLists.darwin.txt b/contrib/restricted/boost/predef/CMakeLists.darwin-x86_64.txt
index c55eab9d0f6..c55eab9d0f6 100644
--- a/contrib/restricted/boost/predef/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/predef/CMakeLists.linux.txt b/contrib/restricted/boost/predef/CMakeLists.linux-x86_64.txt
index a0087e3f0db..a0087e3f0db 100644
--- a/contrib/restricted/boost/predef/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/predef/CMakeLists.txt b/contrib/restricted/boost/predef/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/predef/CMakeLists.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.darwin.txt b/contrib/restricted/boost/preprocessor/CMakeLists.darwin-x86_64.txt
index 7df51769d9a..7df51769d9a 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.linux.txt b/contrib/restricted/boost/preprocessor/CMakeLists.linux-x86_64.txt
index e6e835b5adf..e6e835b5adf 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.txt b/contrib/restricted/boost/preprocessor/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/program_options/CMakeLists.darwin.txt b/contrib/restricted/boost/program_options/CMakeLists.darwin-x86_64.txt
index c91dfc15c59..c91dfc15c59 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/program_options/CMakeLists.linux.txt b/contrib/restricted/boost/program_options/CMakeLists.linux-x86_64.txt
index 1bd268a977a..1bd268a977a 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/program_options/CMakeLists.txt b/contrib/restricted/boost/program_options/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt b/contrib/restricted/boost/property_map/CMakeLists.darwin-x86_64.txt
index d49456c891b..d49456c891b 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/property_map/CMakeLists.linux.txt b/contrib/restricted/boost/property_map/CMakeLists.linux-x86_64.txt
index cfb3bee9458..cfb3bee9458 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/property_map/CMakeLists.txt b/contrib/restricted/boost/property_map/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.darwin.txt b/contrib/restricted/boost/property_tree/CMakeLists.darwin-x86_64.txt
index 57f107d22d6..57f107d22d6 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.linux.txt b/contrib/restricted/boost/property_tree/CMakeLists.linux-x86_64.txt
index b64b977a645..b64b977a645 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.txt b/contrib/restricted/boost/property_tree/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/proto/CMakeLists.darwin.txt b/contrib/restricted/boost/proto/CMakeLists.darwin-x86_64.txt
index 370165e4fff..370165e4fff 100644
--- a/contrib/restricted/boost/proto/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/proto/CMakeLists.linux.txt b/contrib/restricted/boost/proto/CMakeLists.linux-x86_64.txt
index 8fa3b296b20..8fa3b296b20 100644
--- a/contrib/restricted/boost/proto/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/proto/CMakeLists.txt b/contrib/restricted/boost/proto/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/proto/CMakeLists.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/random/CMakeLists.darwin.txt b/contrib/restricted/boost/random/CMakeLists.darwin-x86_64.txt
index 647aa946684..647aa946684 100644
--- a/contrib/restricted/boost/random/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/random/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/random/CMakeLists.linux.txt b/contrib/restricted/boost/random/CMakeLists.linux-x86_64.txt
index 23ae6c61529..23ae6c61529 100644
--- a/contrib/restricted/boost/random/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/random/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/random/CMakeLists.txt b/contrib/restricted/boost/random/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/random/CMakeLists.txt
+++ b/contrib/restricted/boost/random/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/range/CMakeLists.darwin.txt b/contrib/restricted/boost/range/CMakeLists.darwin-x86_64.txt
index eadd2f290c7..eadd2f290c7 100644
--- a/contrib/restricted/boost/range/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/range/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/range/CMakeLists.linux.txt b/contrib/restricted/boost/range/CMakeLists.linux-x86_64.txt
index a97889d7f60..a97889d7f60 100644
--- a/contrib/restricted/boost/range/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/range/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/range/CMakeLists.txt b/contrib/restricted/boost/range/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/range/CMakeLists.txt
+++ b/contrib/restricted/boost/range/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/ratio/CMakeLists.darwin.txt b/contrib/restricted/boost/ratio/CMakeLists.darwin-x86_64.txt
index 7171c49b081..7171c49b081 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/ratio/CMakeLists.linux.txt b/contrib/restricted/boost/ratio/CMakeLists.linux-x86_64.txt
index 90cac9ef7a9..90cac9ef7a9 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/ratio/CMakeLists.txt b/contrib/restricted/boost/ratio/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/rational/CMakeLists.darwin.txt b/contrib/restricted/boost/rational/CMakeLists.darwin-x86_64.txt
index c4d92a21a6e..c4d92a21a6e 100644
--- a/contrib/restricted/boost/rational/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/rational/CMakeLists.linux.txt b/contrib/restricted/boost/rational/CMakeLists.linux-x86_64.txt
index 61fd5149ab3..61fd5149ab3 100644
--- a/contrib/restricted/boost/rational/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/rational/CMakeLists.txt b/contrib/restricted/boost/rational/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/rational/CMakeLists.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/regex/CMakeLists.darwin.txt b/contrib/restricted/boost/regex/CMakeLists.darwin-x86_64.txt
index b0c67b4c889..b0c67b4c889 100644
--- a/contrib/restricted/boost/regex/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/regex/CMakeLists.linux.txt b/contrib/restricted/boost/regex/CMakeLists.linux-x86_64.txt
index 554805be78e..554805be78e 100644
--- a/contrib/restricted/boost/regex/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/regex/CMakeLists.txt b/contrib/restricted/boost/regex/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/regex/CMakeLists.txt
+++ b/contrib/restricted/boost/regex/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/serialization/CMakeLists.darwin.txt b/contrib/restricted/boost/serialization/CMakeLists.darwin-x86_64.txt
index 52603eb79dc..52603eb79dc 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/serialization/CMakeLists.linux.txt b/contrib/restricted/boost/serialization/CMakeLists.linux-x86_64.txt
index 43d01c0ab03..43d01c0ab03 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/serialization/CMakeLists.txt b/contrib/restricted/boost/serialization/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/serialization/CMakeLists.txt
+++ b/contrib/restricted/boost/serialization/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin-x86_64.txt
index e13c2385804..e13c2385804 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-x86_64.txt
index 1c30f857e3c..1c30f857e3c 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/spirit/CMakeLists.darwin.txt b/contrib/restricted/boost/spirit/CMakeLists.darwin-x86_64.txt
index 6a804f549db..6a804f549db 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/spirit/CMakeLists.linux.txt b/contrib/restricted/boost/spirit/CMakeLists.linux-x86_64.txt
index 01948379bbf..01948379bbf 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/spirit/CMakeLists.txt b/contrib/restricted/boost/spirit/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/spirit/CMakeLists.txt
+++ b/contrib/restricted/boost/spirit/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.darwin.txt b/contrib/restricted/boost/static_assert/CMakeLists.darwin-x86_64.txt
index 6506f1babd0..6506f1babd0 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.linux.txt b/contrib/restricted/boost/static_assert/CMakeLists.linux-x86_64.txt
index efc171911e7..efc171911e7 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.txt b/contrib/restricted/boost/static_assert/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/system/CMakeLists.darwin.txt b/contrib/restricted/boost/system/CMakeLists.darwin-x86_64.txt
index 49847620cb9..49847620cb9 100644
--- a/contrib/restricted/boost/system/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/system/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/system/CMakeLists.linux.txt b/contrib/restricted/boost/system/CMakeLists.linux-x86_64.txt
index bb535c43334..bb535c43334 100644
--- a/contrib/restricted/boost/system/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/system/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/system/CMakeLists.txt b/contrib/restricted/boost/system/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/system/CMakeLists.txt
+++ b/contrib/restricted/boost/system/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/thread/CMakeLists.darwin.txt b/contrib/restricted/boost/thread/CMakeLists.darwin-x86_64.txt
index 683da254264..683da254264 100644
--- a/contrib/restricted/boost/thread/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/thread/CMakeLists.linux.txt b/contrib/restricted/boost/thread/CMakeLists.linux-x86_64.txt
index ee0e2e1fcc5..ee0e2e1fcc5 100644
--- a/contrib/restricted/boost/thread/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/thread/CMakeLists.txt b/contrib/restricted/boost/thread/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/thread/CMakeLists.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.darwin.txt b/contrib/restricted/boost/throw_exception/CMakeLists.darwin-x86_64.txt
index eefa32cee28..eefa32cee28 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.linux.txt b/contrib/restricted/boost/throw_exception/CMakeLists.linux-x86_64.txt
index 105ee3325e7..105ee3325e7 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.txt b/contrib/restricted/boost/throw_exception/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.darwin.txt b/contrib/restricted/boost/tokenizer/CMakeLists.darwin-x86_64.txt
index 484614506f2..484614506f2 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.linux.txt b/contrib/restricted/boost/tokenizer/CMakeLists.linux-x86_64.txt
index f150b16ca27..f150b16ca27 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.txt b/contrib/restricted/boost/tokenizer/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tti/CMakeLists.darwin.txt b/contrib/restricted/boost/tti/CMakeLists.darwin-x86_64.txt
index 21cde2d8ba6..21cde2d8ba6 100644
--- a/contrib/restricted/boost/tti/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tti/CMakeLists.linux.txt b/contrib/restricted/boost/tti/CMakeLists.linux-x86_64.txt
index 9c8dd5bc54b..9c8dd5bc54b 100644
--- a/contrib/restricted/boost/tti/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tti/CMakeLists.txt b/contrib/restricted/boost/tti/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/tti/CMakeLists.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/tuple/CMakeLists.darwin.txt b/contrib/restricted/boost/tuple/CMakeLists.darwin-x86_64.txt
index 35051c1252b..35051c1252b 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/tuple/CMakeLists.linux.txt b/contrib/restricted/boost/tuple/CMakeLists.linux-x86_64.txt
index de83f3637ab..de83f3637ab 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/tuple/CMakeLists.txt b/contrib/restricted/boost/tuple/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt b/contrib/restricted/boost/type_index/CMakeLists.darwin-x86_64.txt
index e6366d2523e..e6366d2523e 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/type_index/CMakeLists.linux.txt b/contrib/restricted/boost/type_index/CMakeLists.linux-x86_64.txt
index 333b4a45fd8..333b4a45fd8 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/type_index/CMakeLists.txt b/contrib/restricted/boost/type_index/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt b/contrib/restricted/boost/type_traits/CMakeLists.darwin-x86_64.txt
index a32d4a750ef..a32d4a750ef 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt b/contrib/restricted/boost/type_traits/CMakeLists.linux-x86_64.txt
index 9771ff8a740..9771ff8a740 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.txt b/contrib/restricted/boost/type_traits/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt b/contrib/restricted/boost/typeof/CMakeLists.darwin-x86_64.txt
index 04fff27108b..04fff27108b 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/typeof/CMakeLists.linux.txt b/contrib/restricted/boost/typeof/CMakeLists.linux-x86_64.txt
index ff3ee3a2660..ff3ee3a2660 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/typeof/CMakeLists.txt b/contrib/restricted/boost/typeof/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/unordered/CMakeLists.darwin.txt b/contrib/restricted/boost/unordered/CMakeLists.darwin-x86_64.txt
index 0a1dbba096f..0a1dbba096f 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/unordered/CMakeLists.linux.txt b/contrib/restricted/boost/unordered/CMakeLists.linux-x86_64.txt
index 2c662b87034..2c662b87034 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/unordered/CMakeLists.txt b/contrib/restricted/boost/unordered/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/utility/CMakeLists.darwin.txt b/contrib/restricted/boost/utility/CMakeLists.darwin-x86_64.txt
index 75fd8785291..75fd8785291 100644
--- a/contrib/restricted/boost/utility/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/utility/CMakeLists.linux.txt b/contrib/restricted/boost/utility/CMakeLists.linux-x86_64.txt
index a04da10363c..a04da10363c 100644
--- a/contrib/restricted/boost/utility/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/utility/CMakeLists.txt b/contrib/restricted/boost/utility/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/utility/CMakeLists.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/variant/CMakeLists.darwin.txt b/contrib/restricted/boost/variant/CMakeLists.darwin-x86_64.txt
index 609c9606b81..609c9606b81 100644
--- a/contrib/restricted/boost/variant/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/variant/CMakeLists.linux.txt b/contrib/restricted/boost/variant/CMakeLists.linux-x86_64.txt
index 051a57fd901..051a57fd901 100644
--- a/contrib/restricted/boost/variant/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/variant/CMakeLists.txt b/contrib/restricted/boost/variant/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/variant/CMakeLists.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/variant2/CMakeLists.darwin.txt b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt
index faec5d90979..faec5d90979 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/variant2/CMakeLists.linux.txt b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt
index b3cdd31e101..b3cdd31e101 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/variant2/CMakeLists.txt b/contrib/restricted/boost/variant2/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/variant2/CMakeLists.txt
+++ b/contrib/restricted/boost/variant2/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/winapi/CMakeLists.darwin.txt b/contrib/restricted/boost/winapi/CMakeLists.darwin-x86_64.txt
index 13fd04341f2..13fd04341f2 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/winapi/CMakeLists.linux.txt b/contrib/restricted/boost/winapi/CMakeLists.linux-x86_64.txt
index 08c08093611..08c08093611 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/winapi/CMakeLists.txt b/contrib/restricted/boost/winapi/CMakeLists.txt
index eee324bb607..8f8c04afe54 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.txt
@@ -9,7 +9,7 @@
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID)
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.darwin.txt b/contrib/restricted/boost/xpressive/CMakeLists.darwin-x86_64.txt
index d8974003403..d8974003403 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.darwin-x86_64.txt
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.linux.txt b/contrib/restricted/boost/xpressive/CMakeLists.linux-x86_64.txt
index ad594157635..ad594157635 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.linux-x86_64.txt
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.txt b/contrib/restricted/boost/xpressive/CMakeLists.txt
index 0f8cf0fb161..a603bef54ed 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 
 if (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin.txt)
+  include(CMakeLists.darwin-x86_64.txt)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
-  include(CMakeLists.linux.txt)
+  include(CMakeLists.linux-x86_64.txt)
 endif()