intermediate changes

ref:e8092279aeb152c7934ef72249a90434dbbe4318

14 files changed, 254 insertions, 130 deletions

diff --git a/contrib/libs/cctz/CMakeLists.darwin.txt b/contrib/libs/cctz/CMakeLists.darwin.txt
new file mode 100644
index 0000000000..67cf4379ad
--- /dev/null
+++ b/contrib/libs/cctz/CMakeLists.darwin.txt
@@ -0,0 +1,35 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(contrib-libs-cctz)
+target_include_directories(contrib-libs-cctz PUBLIC
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/include
+)
+target_include_directories(contrib-libs-cctz PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/include
+)
+target_link_libraries(contrib-libs-cctz PUBLIC
+  contrib-libs-cxxsupp
+)
+target_link_options(contrib-libs-cctz INTERFACE
+  -framework
+  CoreFoundation
+)
+target_sources(contrib-libs-cctz PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/civil_time_detail.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_fixed.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_format.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_if.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_impl.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_info.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_libc.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_lookup.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_posix.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/zone_info_source.cc
+)
diff --git a/contrib/libs/cctz/CMakeLists.linux.txt b/contrib/libs/cctz/CMakeLists.linux.txt
new file mode 100644
index 0000000000..379577bfa4
--- /dev/null
+++ b/contrib/libs/cctz/CMakeLists.linux.txt
@@ -0,0 +1,31 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(contrib-libs-cctz)
+target_include_directories(contrib-libs-cctz PUBLIC
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/include
+)
+target_include_directories(contrib-libs-cctz PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/include
+)
+target_link_libraries(contrib-libs-cctz PUBLIC
+  contrib-libs-cxxsupp
+)
+target_sources(contrib-libs-cctz PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/civil_time_detail.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_fixed.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_format.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_if.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_impl.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_info.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_libc.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_lookup.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_posix.cc
+  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/zone_info_source.cc
+)
diff --git a/contrib/libs/cctz/CMakeLists.txt b/contrib/libs/cctz/CMakeLists.txt
index 379577bfa4..a681d385f3 100644
--- a/contrib/libs/cctz/CMakeLists.txt
+++ b/contrib/libs/cctz/CMakeLists.txt
@@ -6,26 +6,8 @@
 # original buildsystem will not be accepted.
 
 
-
-add_library(contrib-libs-cctz)
-target_include_directories(contrib-libs-cctz PUBLIC
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/include
-)
-target_include_directories(contrib-libs-cctz PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/include
-)
-target_link_libraries(contrib-libs-cctz PUBLIC
-  contrib-libs-cxxsupp
-)
-target_sources(contrib-libs-cctz PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/civil_time_detail.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_fixed.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_format.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_if.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_impl.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_info.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_libc.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_lookup.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/time_zone_posix.cc
-  ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/src/zone_info_source.cc
-)
+if (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (UNIX)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin.txt
index 5401fb00e9..165f5fd495 100644
--- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin.txt
+++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.darwin.txt
@@ -19,6 +19,12 @@ target_link_libraries(llvm-tblgen PUBLIC
   llvm12-lib-TableGen
   utils-TableGen-GlobalISel
 )
+target_link_options(llvm-tblgen PRIVATE
+  -Wl,-no_deduplicate
+  -Wl,-sdk_version,10.15
+  -fPIC
+  -fPIC
+)
 target_sources(llvm-tblgen PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/AsmMatcherEmitter.cpp
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/AsmWriterEmitter.cpp
@@ -73,11 +79,4 @@ target_sources(llvm-tblgen PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86ModRMFilters.cpp
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86RecognizableInstr.cpp
 )
-target_link_flags(llvm-tblgen
-  PUBLIC
-  -Wl,-no_deduplicate
-  -Wl,-sdk_version,10.15
-  -fPIC
-  -fPIC
-)
 vcs_info(llvm-tblgen)
diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux.txt
index 93bbea30a1..875a0af01f 100644
--- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux.txt
+++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.linux.txt
@@ -20,6 +20,16 @@ target_link_libraries(llvm-tblgen PUBLIC
   llvm12-lib-TableGen
   utils-TableGen-GlobalISel
 )
+target_link_options(llvm-tblgen PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
 target_sources(llvm-tblgen PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/AsmMatcherEmitter.cpp
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/AsmWriterEmitter.cpp
@@ -74,15 +84,4 @@ target_sources(llvm-tblgen PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86ModRMFilters.cpp
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/utils/TableGen/X86RecognizableInstr.cpp
 )
-target_link_flags(llvm-tblgen
-  PUBLIC
-  -ldl
-  -lrt
-  -Wl,--no-as-needed
-  -fPIC
-  -fPIC
-  -lpthread
-  -lrt
-  -ldl
-)
 vcs_info(llvm-tblgen)
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
new file mode 100644
index 0000000000..10b97eb4f9
--- /dev/null
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
@@ -0,0 +1,71 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(restricted-aws-aws-c-common)
+target_include_directories(restricted-aws-aws-c-common PUBLIC
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/generated/include
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/include
+)
+target_include_directories(restricted-aws-aws-c-common PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/generated/include
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/include
+)
+target_link_options(restricted-aws-aws-c-common INTERFACE
+  -framework
+  CoreFoundation
+)
+target_sources(restricted-aws-aws-c-common PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator_sba.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/array_list.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/assert.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/byte_buf.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/cache.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/codegen.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/command_line_parser.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/common.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/condition_variable.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/date_time.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/device_random.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/encoding.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/error.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/fifo_cache.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/hash_table.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/lifo_cache.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/linked_hash_table.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_channel.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_formatter.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_writer.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/logging.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/lru_cache.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/math.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/memtrace.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/clock.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/condition_variable.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/device_random.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/environment.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/mutex.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/process.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/rw_lock.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/system_info.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/thread.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/time.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/priority_queue.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/process_common.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/ref_count.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/resource_name.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/ring_buffer.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/statistics.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/string.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/task_scheduler.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/uuid.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/xml_parser.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/asm/cpuid.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/cpuid.c
+)
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
new file mode 100644
index 0000000000..a38629a11e
--- /dev/null
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
@@ -0,0 +1,67 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(restricted-aws-aws-c-common)
+target_include_directories(restricted-aws-aws-c-common PUBLIC
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/generated/include
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/include
+)
+target_include_directories(restricted-aws-aws-c-common PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/generated/include
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/include
+)
+target_sources(restricted-aws-aws-c-common PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator_sba.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/array_list.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/assert.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/byte_buf.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/cache.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/codegen.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/command_line_parser.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/common.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/condition_variable.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/date_time.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/device_random.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/encoding.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/error.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/fifo_cache.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/hash_table.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/lifo_cache.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/linked_hash_table.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_channel.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_formatter.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_writer.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/logging.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/lru_cache.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/math.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/memtrace.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/clock.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/condition_variable.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/device_random.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/environment.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/mutex.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/process.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/rw_lock.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/system_info.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/thread.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/time.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/priority_queue.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/process_common.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/ref_count.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/resource_name.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/ring_buffer.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/statistics.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/string.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/task_scheduler.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/uuid.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/xml_parser.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/asm/cpuid.c
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/cpuid.c
+)
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.txt
index a38629a11e..a681d385f3 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.txt
@@ -6,62 +6,8 @@
 # original buildsystem will not be accepted.
 
 
-
-add_library(restricted-aws-aws-c-common)
-target_include_directories(restricted-aws-aws-c-common PUBLIC
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/generated/include
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/include
-)
-target_include_directories(restricted-aws-aws-c-common PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/generated/include
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/include
-)
-target_sources(restricted-aws-aws-c-common PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator_sba.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/array_list.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/assert.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/byte_buf.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/cache.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/codegen.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/command_line_parser.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/common.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/condition_variable.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/date_time.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/device_random.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/encoding.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/error.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/fifo_cache.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/hash_table.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/lifo_cache.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/linked_hash_table.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_channel.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_formatter.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/log_writer.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/logging.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/lru_cache.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/math.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/memtrace.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/clock.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/condition_variable.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/device_random.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/environment.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/mutex.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/process.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/rw_lock.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/system_info.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/thread.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/posix/time.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/priority_queue.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/process_common.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/ref_count.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/resource_name.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/ring_buffer.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/statistics.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/string.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/task_scheduler.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/uuid.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/xml_parser.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/asm/cpuid.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/cpuid.c
-)
+if (APPLE)
+  include(CMakeLists.darwin.txt)
+elseif (UNIX)
+  include(CMakeLists.linux.txt)
+endif()
diff --git a/contrib/tools/protoc/bin/CMakeLists.darwin.txt b/contrib/tools/protoc/bin/CMakeLists.darwin.txt
index 00c5ae2afa..81fe0970e1 100644
--- a/contrib/tools/protoc/bin/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.darwin.txt
@@ -14,14 +14,13 @@ target_link_libraries(protoc PUBLIC
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
-target_sources(protoc PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
-)
-target_link_flags(protoc
-  PUBLIC
+target_link_options(protoc PRIVATE
   -Wl,-no_deduplicate
   -Wl,-sdk_version,10.15
   -fPIC
   -fPIC
 )
+target_sources(protoc PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
+)
 vcs_info(protoc)
diff --git a/contrib/tools/protoc/bin/CMakeLists.linux.txt b/contrib/tools/protoc/bin/CMakeLists.linux.txt
index d0e1886d1e..59419fb969 100644
--- a/contrib/tools/protoc/bin/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.linux.txt
@@ -15,11 +15,7 @@ target_link_libraries(protoc PUBLIC
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
-target_sources(protoc PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
-)
-target_link_flags(protoc
-  PUBLIC
+target_link_options(protoc PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -29,4 +25,7 @@ target_link_flags(protoc
   -lrt
   -ldl
 )
+target_sources(protoc PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
+)
 vcs_info(protoc)
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
index c86c30114f..3f6b3edfd3 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
@@ -14,14 +14,13 @@ target_link_libraries(cpp_styleguide PUBLIC
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
-target_sources(cpp_styleguide PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
-)
-target_link_flags(cpp_styleguide
-  PUBLIC
+target_link_options(cpp_styleguide PRIVATE
   -Wl,-no_deduplicate
   -Wl,-sdk_version,10.15
   -fPIC
   -fPIC
 )
+target_sources(cpp_styleguide PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+)
 vcs_info(cpp_styleguide)
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
index f7cbff28a2..84ec725be3 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
@@ -15,11 +15,7 @@ target_link_libraries(cpp_styleguide PUBLIC
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
-target_sources(cpp_styleguide PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
-)
-target_link_flags(cpp_styleguide
-  PUBLIC
+target_link_options(cpp_styleguide PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -29,4 +25,7 @@ target_link_flags(cpp_styleguide
   -lrt
   -ldl
 )
+target_sources(cpp_styleguide PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+)
 vcs_info(cpp_styleguide)
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt
index 9af28345e4..340c4a561e 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt
@@ -21,14 +21,13 @@ target_link_libraries(grpc_cpp PUBLIC
   library-cpp-cpuid_check
   src-compiler-grpc_plugin_support
 )
-target_sources(grpc_cpp PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/compiler/cpp_plugin.cc
-)
-target_link_flags(grpc_cpp
-  PUBLIC
+target_link_options(grpc_cpp PRIVATE
   -Wl,-no_deduplicate
   -Wl,-sdk_version,10.15
   -fPIC
   -fPIC
 )
+target_sources(grpc_cpp PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/compiler/cpp_plugin.cc
+)
 vcs_info(grpc_cpp)
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt
index ea5b708509..e93850280e 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt
@@ -22,11 +22,7 @@ target_link_libraries(grpc_cpp PUBLIC
   library-cpp-cpuid_check
   src-compiler-grpc_plugin_support
 )
-target_sources(grpc_cpp PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/compiler/cpp_plugin.cc
-)
-target_link_flags(grpc_cpp
-  PUBLIC
+target_link_options(grpc_cpp PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -36,4 +32,7 @@ target_link_flags(grpc_cpp
   -lrt
   -ldl
 )
+target_sources(grpc_cpp PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/compiler/cpp_plugin.cc
+)
 vcs_info(grpc_cpp)