Intermediate changes

12 files changed, 39 insertions, 15 deletions

diff --git a/tools/archiver/CMakeLists.darwin-x86_64.txt b/tools/archiver/CMakeLists.darwin-x86_64.txt
index 6a56edb8588..1a15b734db7 100644
--- a/tools/archiver/CMakeLists.darwin-x86_64.txt
+++ b/tools/archiver/CMakeLists.darwin-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(archiver)
 target_link_libraries(archiver PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   library-cpp-archive
   cpp-digest-md5
@@ -25,4 +24,7 @@ target_link_options(archiver PRIVATE
 target_sources(archiver PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/archiver/main.cpp
 )
+target_allocator(archiver
+  system_allocator
+)
 vcs_info(archiver)
diff --git a/tools/archiver/CMakeLists.linux-aarch64.txt b/tools/archiver/CMakeLists.linux-aarch64.txt
index d2c78773b18..d3947a906d3 100644
--- a/tools/archiver/CMakeLists.linux-aarch64.txt
+++ b/tools/archiver/CMakeLists.linux-aarch64.txt
@@ -12,7 +12,6 @@ target_link_libraries(archiver PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   library-cpp-archive
   cpp-digest-md5
   cpp-getopt-small
@@ -30,4 +29,7 @@ target_link_options(archiver PRIVATE
 target_sources(archiver PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/archiver/main.cpp
 )
+target_allocator(archiver
+  cpp-malloc-jemalloc
+)
 vcs_info(archiver)
diff --git a/tools/archiver/CMakeLists.linux-x86_64.txt b/tools/archiver/CMakeLists.linux-x86_64.txt
index 398ec597812..7ae5f5ed7f2 100644
--- a/tools/archiver/CMakeLists.linux-x86_64.txt
+++ b/tools/archiver/CMakeLists.linux-x86_64.txt
@@ -12,8 +12,6 @@ target_link_libraries(archiver PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   library-cpp-archive
   cpp-digest-md5
@@ -32,4 +30,8 @@ target_link_options(archiver PRIVATE
 target_sources(archiver PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/archiver/main.cpp
 )
+target_allocator(archiver
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(archiver)
diff --git a/tools/archiver/CMakeLists.windows-x86_64.txt b/tools/archiver/CMakeLists.windows-x86_64.txt
index 54df43d0a33..8788affad6e 100644
--- a/tools/archiver/CMakeLists.windows-x86_64.txt
+++ b/tools/archiver/CMakeLists.windows-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(archiver)
 target_link_libraries(archiver PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   library-cpp-archive
   cpp-digest-md5
@@ -20,4 +19,7 @@ target_link_libraries(archiver PUBLIC
 target_sources(archiver PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/archiver/main.cpp
 )
+target_allocator(archiver
+  system_allocator
+)
 vcs_info(archiver)
diff --git a/tools/enum_parser/enum_parser/CMakeLists.darwin-x86_64.txt b/tools/enum_parser/enum_parser/CMakeLists.darwin-x86_64.txt
index 9b7da6f1740..59d95687ab0 100644
--- a/tools/enum_parser/enum_parser/CMakeLists.darwin-x86_64.txt
+++ b/tools/enum_parser/enum_parser/CMakeLists.darwin-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(enum_parser)
 target_link_libraries(enum_parser PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-getopt-small
   tools-enum_parser-parse_enum
@@ -24,4 +23,7 @@ target_link_options(enum_parser PRIVATE
 target_sources(enum_parser PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/enum_parser/enum_parser/main.cpp
 )
+target_allocator(enum_parser
+  system_allocator
+)
 vcs_info(enum_parser)
diff --git a/tools/enum_parser/enum_parser/CMakeLists.linux-aarch64.txt b/tools/enum_parser/enum_parser/CMakeLists.linux-aarch64.txt
index 45838aa0f13..04196e5f087 100644
--- a/tools/enum_parser/enum_parser/CMakeLists.linux-aarch64.txt
+++ b/tools/enum_parser/enum_parser/CMakeLists.linux-aarch64.txt
@@ -12,7 +12,6 @@ target_link_libraries(enum_parser PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   cpp-getopt-small
   tools-enum_parser-parse_enum
 )
@@ -29,4 +28,7 @@ target_link_options(enum_parser PRIVATE
 target_sources(enum_parser PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/enum_parser/enum_parser/main.cpp
 )
+target_allocator(enum_parser
+  cpp-malloc-jemalloc
+)
 vcs_info(enum_parser)
diff --git a/tools/enum_parser/enum_parser/CMakeLists.linux-x86_64.txt b/tools/enum_parser/enum_parser/CMakeLists.linux-x86_64.txt
index 56e5139b675..18ccff5c552 100644
--- a/tools/enum_parser/enum_parser/CMakeLists.linux-x86_64.txt
+++ b/tools/enum_parser/enum_parser/CMakeLists.linux-x86_64.txt
@@ -12,8 +12,6 @@ target_link_libraries(enum_parser PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-getopt-small
   tools-enum_parser-parse_enum
@@ -31,4 +29,8 @@ target_link_options(enum_parser PRIVATE
 target_sources(enum_parser PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/enum_parser/enum_parser/main.cpp
 )
+target_allocator(enum_parser
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(enum_parser)
diff --git a/tools/enum_parser/enum_parser/CMakeLists.windows-x86_64.txt b/tools/enum_parser/enum_parser/CMakeLists.windows-x86_64.txt
index 4d598edeb45..2684df8d52c 100644
--- a/tools/enum_parser/enum_parser/CMakeLists.windows-x86_64.txt
+++ b/tools/enum_parser/enum_parser/CMakeLists.windows-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(enum_parser)
 target_link_libraries(enum_parser PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   cpp-getopt-small
   tools-enum_parser-parse_enum
@@ -19,4 +18,7 @@ target_link_libraries(enum_parser PUBLIC
 target_sources(enum_parser PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/enum_parser/enum_parser/main.cpp
 )
+target_allocator(enum_parser
+  system_allocator
+)
 vcs_info(enum_parser)
diff --git a/tools/rescompiler/bin/CMakeLists.darwin-x86_64.txt b/tools/rescompiler/bin/CMakeLists.darwin-x86_64.txt
index 348117b883b..2c212760458 100644
--- a/tools/rescompiler/bin/CMakeLists.darwin-x86_64.txt
+++ b/tools/rescompiler/bin/CMakeLists.darwin-x86_64.txt
@@ -11,7 +11,6 @@ add_executable(rescompiler)
 target_link_libraries(rescompiler PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   library-cpp-resource
 )
@@ -23,4 +22,7 @@ target_link_options(rescompiler PRIVATE
 target_sources(rescompiler PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/rescompiler/main.cpp
 )
+target_allocator(rescompiler
+  system_allocator
+)
 vcs_info(rescompiler)
diff --git a/tools/rescompiler/bin/CMakeLists.linux-aarch64.txt b/tools/rescompiler/bin/CMakeLists.linux-aarch64.txt
index bd9f8ffd5c6..149f6f4225b 100644
--- a/tools/rescompiler/bin/CMakeLists.linux-aarch64.txt
+++ b/tools/rescompiler/bin/CMakeLists.linux-aarch64.txt
@@ -12,7 +12,6 @@ target_link_libraries(rescompiler PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-jemalloc
   library-cpp-resource
 )
 target_link_options(rescompiler PRIVATE
@@ -28,4 +27,7 @@ target_link_options(rescompiler PRIVATE
 target_sources(rescompiler PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/rescompiler/main.cpp
 )
+target_allocator(rescompiler
+  cpp-malloc-jemalloc
+)
 vcs_info(rescompiler)
diff --git a/tools/rescompiler/bin/CMakeLists.linux-x86_64.txt b/tools/rescompiler/bin/CMakeLists.linux-x86_64.txt
index 6fa1888e8f5..dda1f62fe38 100644
--- a/tools/rescompiler/bin/CMakeLists.linux-x86_64.txt
+++ b/tools/rescompiler/bin/CMakeLists.linux-x86_64.txt
@@ -12,8 +12,6 @@ target_link_libraries(rescompiler PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   library-cpp-resource
 )
@@ -30,4 +28,8 @@ target_link_options(rescompiler PRIVATE
 target_sources(rescompiler PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/rescompiler/main.cpp
 )
+target_allocator(rescompiler
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
 vcs_info(rescompiler)
diff --git a/tools/rescompiler/bin/CMakeLists.windows-x86_64.txt b/tools/rescompiler/bin/CMakeLists.windows-x86_64.txt
index 1b27d3e7ec5..5b85c1b8072 100644
--- a/tools/rescompiler/bin/CMakeLists.windows-x86_64.txt
+++ b/tools/rescompiler/bin/CMakeLists.windows-x86_64.txt
@@ -11,11 +11,13 @@ add_executable(rescompiler)
 target_link_libraries(rescompiler PUBLIC
   contrib-libs-cxxsupp
   yutil
-  cpp-malloc-system
   library-cpp-cpuid_check
   library-cpp-resource
 )
 target_sources(rescompiler PRIVATE
   ${CMAKE_SOURCE_DIR}/tools/rescompiler/main.cpp
 )
+target_allocator(rescompiler
+  system_allocator
+)
 vcs_info(rescompiler)