intermediate changes

ref:a2def34fe7b595460d7ee820cdd054755d790eeb

17 files changed, 25 insertions, 173 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 621858ab45a..65eee623d61 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -7053,14 +7053,14 @@ macro SYMLINK(From, To) {
 
 # tag:internal
 ### @usage: _TARGET_SOURCES_FOR_HEADERS_IMPL([GENERATE] Args...) # internal
-### Generate prefix " && target_sources INTERFACE " before $Args when GENERATE is specified in the list of actual arguments
-macro _TARGET_SOURCES_FOR_HEADERS_IMPL(GENERATE?" && target_sources INTERFACE ":"", Args...) {
+### Generate prefix " && target_sources PRIVATE " before $Args when GENERATE is specified in the list of actual arguments
+macro _TARGET_SOURCES_FOR_HEADERS_IMPL(GENERATE?" && target_sources PRIVATE ":"", Args...) {
     .SEM=$GENERATE ${output;ext=.h:Args} ${output;ext=.hh:Args} ${output;ext=.hpp:Args} ${output;ext=.inc:Args} ${output;ext=.i:Args}
 }
 
 # tag:internal
 ### @usage: _TARGET_SOURCES_FOR_HEADERS(Args...) # internal
-### Generate prefix " && target_sources INTERFACE " before $Args if Args is not empty
+### Generate prefix " && target_sources PRIVATE " before $Args if Args is not empty
 macro _TARGET_SOURCES_FOR_HEADERS(Args...) {
     .SEM=$_TARGET_SOURCES_FOR_HEADERS_IMPL(${pre=GENERATE :Args})
 }
diff --git a/contrib/libs/llvm12/include/CMakeLists.txt b/contrib/libs/llvm12/include/CMakeLists.txt
index aba0bf59a95..8dc2d860797 100644
--- a/contrib/libs/llvm12/include/CMakeLists.txt
+++ b/contrib/libs/llvm12/include/CMakeLists.txt
@@ -3,115 +3,6 @@ target_link_libraries(libs-llvm12-include INTERFACE
   contrib-libs-cxxsupp
   contrib-libs-llvm12
 )
-target_sources(libs-llvm12-include INTERFACE
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/Frontend/OpenACC/ACC.h.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/Frontend/OpenMP/OMP.h.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/Attributes.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicEnums.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicImpl.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsAArch64.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsAMDGPU.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsARM.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsBPF.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsHexagon.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsMips.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsNVPTX.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsPowerPC.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsR600.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsRISCV.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsS390.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsVE.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsWebAssembly.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsX86.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsXCore.h
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenAsmMatcher.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenAsmWriter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenAsmWriter1.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenCallingConv.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenDAGISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenDisassemblerTables.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenExegesis.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenFastISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenGlobalISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenInstrInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenMCCodeEmitter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenMCPseudoLowering.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenPostLegalizeGICombiner.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenPostLegalizeGILowering.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenPreLegalizeGICombiner.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenRegisterBank.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenRegisterInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenSubtargetInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenSystemOperands.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenAsmMatcher.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenAsmWriter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenCallingConv.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenDAGISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenDisassemblerTables.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenFastISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenGlobalISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenInstrInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenMCCodeEmitter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenMCPseudoLowering.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenRegisterBank.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenRegisterInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenSubtargetInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenSystemRegister.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenAsmMatcher.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenAsmWriter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenCallingConv.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenDAGISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenDisassemblerTables.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenInstrInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenMCCodeEmitter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenRegisterInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenSubtargetInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenAsmWriter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenDAGISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenInstrInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenRegisterInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenSubtargetInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenAsmMatcher.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenAsmWriter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenCallingConv.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenDAGISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenDisassemblerTables.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenExegesis.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenFastISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenGlobalISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenInstrInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenMCCodeEmitter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenRegisterBank.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenRegisterInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenSubtargetInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenAsmMatcher.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenAsmWriter.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenAsmWriter1.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenCallingConv.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenDAGISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenDisassemblerTables.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenEVEX2VEXTables.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenExegesis.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenFastISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenGlobalISel.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenInstrInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenRegisterBank.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenRegisterInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenSubtargetInfo.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/ToolDrivers/llvm-dlltool/Options.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/ToolDrivers/llvm-lib/Options.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/dsymutil/Options.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-cvtres/Opts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-lipo/LipoOpts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-ml/Opts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-mt/Opts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-objcopy/BitcodeStripOpts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-objcopy/InstallNameToolOpts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-objcopy/ObjcopyOpts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-objcopy/StripOpts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-rc/Opts.inc
-  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-symbolizer/Opts.inc
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/Frontend/OpenACC/ACC.h.inc
diff --git a/library/cpp/build_info/CMakeLists.txt b/library/cpp/build_info/CMakeLists.txt
index 3f2ab03f7b1..32dbcd3f342 100644
--- a/library/cpp/build_info/CMakeLists.txt
+++ b/library/cpp/build_info/CMakeLists.txt
@@ -6,11 +6,9 @@ target_link_libraries(library-cpp-build_info PUBLIC
   yutil
   cpp-string_utils-base64
 )
-target_sources(library-cpp-build_info INTERFACE
-  ${CMAKE_BINARY_DIR}/library/cpp/build_info/buildinfo_data.h
-)
 target_sources(library-cpp-build_info PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/build_info/build_info_static.cpp
+  ${CMAKE_BINARY_DIR}/library/cpp/build_info/buildinfo_data.h
   ${CMAKE_BINARY_DIR}/library/cpp/build_info/sandbox.cpp
   ${CMAKE_BINARY_DIR}/library/cpp/build_info/build_info.cpp
 )
diff --git a/library/cpp/digest/old_crc/CMakeLists.txt b/library/cpp/digest/old_crc/CMakeLists.txt
index dda20afa32c..3f6a0956220 100644
--- a/library/cpp/digest/old_crc/CMakeLists.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.txt
@@ -3,11 +3,9 @@ target_link_libraries(cpp-digest-old_crc PUBLIC
   contrib-libs-cxxsupp
   yutil
 )
-target_sources(cpp-digest-old_crc INTERFACE
-  ${CMAKE_BINARY_DIR}/library/cpp/digest/old_crc/crc.inc
-)
 target_sources(cpp-digest-old_crc PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/digest/old_crc/crc.cpp
+  ${CMAKE_BINARY_DIR}/library/cpp/digest/old_crc/crc.inc
 )
 add_custom_command(
   OUTPUT
diff --git a/library/cpp/tld/CMakeLists.txt b/library/cpp/tld/CMakeLists.txt
index 0a8cb1877c2..21eab54fef9 100644
--- a/library/cpp/tld/CMakeLists.txt
+++ b/library/cpp/tld/CMakeLists.txt
@@ -6,11 +6,9 @@ target_link_libraries(library-cpp-tld PUBLIC
   yutil
   cpp-digest-lower_case
 )
-target_sources(library-cpp-tld INTERFACE
-  ${CMAKE_BINARY_DIR}/library/cpp/tld/tld.inc
-)
 target_sources(library-cpp-tld PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/tld/tld.cpp
+  ${CMAKE_BINARY_DIR}/library/cpp/tld/tld.inc
 )
 add_custom_command(
   OUTPUT
diff --git a/ydb/core/kqp/expr_nodes/CMakeLists.txt b/ydb/core/kqp/expr_nodes/CMakeLists.txt
index c278f4288d9..01d8fa4b795 100644
--- a/ydb/core/kqp/expr_nodes/CMakeLists.txt
+++ b/ydb/core/kqp/expr_nodes/CMakeLists.txt
@@ -4,14 +4,12 @@ target_link_libraries(core-kqp-expr_nodes PUBLIC
   yutil
   yql-dq-expr_nodes
 )
-target_sources(core-kqp-expr_nodes INTERFACE
+target_sources(core-kqp-expr_nodes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/expr_nodes/kqp_expr_nodes.cpp
   ${CMAKE_BINARY_DIR}/ydb/core/kqp/expr_nodes/kqp_expr_nodes.gen.h
   ${CMAKE_BINARY_DIR}/ydb/core/kqp/expr_nodes/kqp_expr_nodes.decl.inl.h
   ${CMAKE_BINARY_DIR}/ydb/core/kqp/expr_nodes/kqp_expr_nodes.defs.inl.h
 )
-target_sources(core-kqp-expr_nodes PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/expr_nodes/kqp_expr_nodes.cpp
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/core/kqp/expr_nodes/kqp_expr_nodes.gen.h
diff --git a/ydb/core/kqp/provider/CMakeLists.txt b/ydb/core/kqp/provider/CMakeLists.txt
index fbc103749e2..842292adf26 100644
--- a/ydb/core/kqp/provider/CMakeLists.txt
+++ b/ydb/core/kqp/provider/CMakeLists.txt
@@ -28,11 +28,6 @@ target_link_libraries(core-kqp-provider PUBLIC
   yql-sql-pg_dummy
   tools-enum_parser-enum_serialization_runtime
 )
-target_sources(core-kqp-provider INTERFACE
-  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/yql_kikimr_expr_nodes.gen.h
-  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/yql_kikimr_expr_nodes.decl.inl.h
-  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/yql_kikimr_expr_nodes.defs.inl.h
-)
 target_sources(core-kqp-provider PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/provider/kqp_opt_helpers.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/provider/yql_kikimr_datasink.cpp
@@ -52,6 +47,9 @@ target_sources(core-kqp-provider PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/provider/yql_kikimr_results.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/provider/yql_kikimr_settings.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/provider/yql_kikimr_type_ann.cpp
+  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/yql_kikimr_expr_nodes.gen.h
+  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/yql_kikimr_expr_nodes.decl.inl.h
+  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/yql_kikimr_expr_nodes.defs.inl.h
 )
 add_custom_command(
   OUTPUT
diff --git a/ydb/core/kqp/provider/mkql/CMakeLists.txt b/ydb/core/kqp/provider/mkql/CMakeLists.txt
index 62a96f3956d..1fab734a31b 100644
--- a/ydb/core/kqp/provider/mkql/CMakeLists.txt
+++ b/ydb/core/kqp/provider/mkql/CMakeLists.txt
@@ -32,11 +32,6 @@ target_link_libraries(kqp-provider-mkql INTERFACE
   library-cpp-cpuid_check
   src-Modules-_sqlite
 )
-target_sources(kqp-provider-mkql INTERFACE
-  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/mkql/yql_kikimr_mkql_expr_nodes.gen.h
-  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/mkql/yql_kikimr_mkql_expr_nodes.decl.inl.h
-  ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/mkql/yql_kikimr_mkql_expr_nodes.defs.inl.h
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/core/kqp/provider/mkql/yql_kikimr_mkql_expr_nodes.gen.h
diff --git a/ydb/library/yql/core/expr_nodes/CMakeLists.txt b/ydb/library/yql/core/expr_nodes/CMakeLists.txt
index 8b75c7a12a0..5df709fd66c 100644
--- a/ydb/library/yql/core/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/core/expr_nodes/CMakeLists.txt
@@ -6,14 +6,12 @@ target_link_libraries(yql-core-expr_nodes PUBLIC
   yql-public-udf
   yql-core-issue
 )
-target_sources(yql-core-expr_nodes INTERFACE
+target_sources(yql-core-expr_nodes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/core/expr_nodes/yql_expr_nodes.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/core/expr_nodes/yql_expr_nodes.gen.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/core/expr_nodes/yql_expr_nodes.decl.inl.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/core/expr_nodes/yql_expr_nodes.defs.inl.h
 )
-target_sources(yql-core-expr_nodes PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/core/expr_nodes/yql_expr_nodes.cpp
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/core/expr_nodes/yql_expr_nodes.gen.h
diff --git a/ydb/library/yql/dq/expr_nodes/CMakeLists.txt b/ydb/library/yql/dq/expr_nodes/CMakeLists.txt
index 490e43b71b8..29baeb4893a 100644
--- a/ydb/library/yql/dq/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/dq/expr_nodes/CMakeLists.txt
@@ -4,11 +4,6 @@ target_link_libraries(yql-dq-expr_nodes INTERFACE
   yutil
   yql-core-expr_nodes
 )
-target_sources(yql-dq-expr_nodes INTERFACE
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/dq/expr_nodes/dq_expr_nodes.gen.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/dq/expr_nodes/dq_expr_nodes.decl.inl.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/dq/expr_nodes/dq_expr_nodes.defs.inl.h
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/dq/expr_nodes/dq_expr_nodes.gen.h
diff --git a/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.txt
index 9613c33cf30..9cee73794c6 100644
--- a/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/clickhouse/expr_nodes/CMakeLists.txt
@@ -5,14 +5,12 @@ target_link_libraries(providers-clickhouse-expr_nodes PUBLIC
   yql-core-expr_nodes
   providers-common-provider
 )
-target_sources(providers-clickhouse-expr_nodes INTERFACE
+target_sources(providers-clickhouse-expr_nodes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/clickhouse/expr_nodes/yql_clickhouse_expr_nodes.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/clickhouse/expr_nodes/yql_clickhouse_expr_nodes.gen.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/clickhouse/expr_nodes/yql_clickhouse_expr_nodes.decl.inl.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/clickhouse/expr_nodes/yql_clickhouse_expr_nodes.defs.inl.h
 )
-target_sources(providers-clickhouse-expr_nodes PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/clickhouse/expr_nodes/yql_clickhouse_expr_nodes.cpp
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/clickhouse/expr_nodes/yql_clickhouse_expr_nodes.gen.h
diff --git a/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.txt
index 97e1064df28..d2dec3e22fa 100644
--- a/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/expr_nodes/CMakeLists.txt
@@ -4,11 +4,6 @@ target_link_libraries(providers-dq-expr_nodes INTERFACE
   yutil
   yql-core-expr_nodes
 )
-target_sources(providers-dq-expr_nodes INTERFACE
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.gen.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.decl.inl.h
-  ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.defs.inl.h
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/dq/expr_nodes/dqs_expr_nodes.gen.h
diff --git a/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.txt
index 6ae60d76be3..c3cc18208d1 100644
--- a/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/pq/expr_nodes/CMakeLists.txt
@@ -5,14 +5,12 @@ target_link_libraries(providers-pq-expr_nodes PUBLIC
   yql-core-expr_nodes
   providers-common-provider
 )
-target_sources(providers-pq-expr_nodes INTERFACE
+target_sources(providers-pq-expr_nodes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/pq/expr_nodes/yql_pq_expr_nodes.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/pq/expr_nodes/yql_pq_expr_nodes.gen.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/pq/expr_nodes/yql_pq_expr_nodes.decl.inl.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/pq/expr_nodes/yql_pq_expr_nodes.defs.inl.h
 )
-target_sources(providers-pq-expr_nodes PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/pq/expr_nodes/yql_pq_expr_nodes.cpp
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/pq/expr_nodes/yql_pq_expr_nodes.gen.h
diff --git a/ydb/library/yql/providers/result/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/result/expr_nodes/CMakeLists.txt
index 4f4ff76148c..59025a7e315 100644
--- a/ydb/library/yql/providers/result/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/result/expr_nodes/CMakeLists.txt
@@ -5,14 +5,12 @@ target_link_libraries(providers-result-expr_nodes PUBLIC
   yql-core-expr_nodes
   providers-common-provider
 )
-target_sources(providers-result-expr_nodes INTERFACE
+target_sources(providers-result-expr_nodes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/result/expr_nodes/yql_res_expr_nodes.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/result/expr_nodes/yql_res_expr_nodes.gen.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/result/expr_nodes/yql_res_expr_nodes.decl.inl.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/result/expr_nodes/yql_res_expr_nodes.defs.inl.h
 )
-target_sources(providers-result-expr_nodes PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/result/expr_nodes/yql_res_expr_nodes.cpp
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/result/expr_nodes/yql_res_expr_nodes.gen.h
diff --git a/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.txt
index 47b8ec7d0be..e4f9a7dce9a 100644
--- a/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/s3/expr_nodes/CMakeLists.txt
@@ -5,14 +5,12 @@ target_link_libraries(providers-s3-expr_nodes PUBLIC
   yql-core-expr_nodes
   providers-common-provider
 )
-target_sources(providers-s3-expr_nodes INTERFACE
+target_sources(providers-s3-expr_nodes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/expr_nodes/yql_s3_expr_nodes.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/s3/expr_nodes/yql_s3_expr_nodes.gen.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/s3/expr_nodes/yql_s3_expr_nodes.decl.inl.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/s3/expr_nodes/yql_s3_expr_nodes.defs.inl.h
 )
-target_sources(providers-s3-expr_nodes PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/s3/expr_nodes/yql_s3_expr_nodes.cpp
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/s3/expr_nodes/yql_s3_expr_nodes.gen.h
diff --git a/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.txt
index 6e0f40e0b9e..9ba6cc48a7c 100644
--- a/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/solomon/expr_nodes/CMakeLists.txt
@@ -5,14 +5,12 @@ target_link_libraries(providers-solomon-expr_nodes PUBLIC
   yql-core-expr_nodes
   providers-common-provider
 )
-target_sources(providers-solomon-expr_nodes INTERFACE
+target_sources(providers-solomon-expr_nodes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/solomon/expr_nodes/yql_solomon_expr_nodes.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/solomon/expr_nodes/yql_solomon_expr_nodes.gen.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/solomon/expr_nodes/yql_solomon_expr_nodes.decl.inl.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/solomon/expr_nodes/yql_solomon_expr_nodes.defs.inl.h
 )
-target_sources(providers-solomon-expr_nodes PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/solomon/expr_nodes/yql_solomon_expr_nodes.cpp
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/solomon/expr_nodes/yql_solomon_expr_nodes.gen.h
diff --git a/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.txt b/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.txt
index 25d972e9f43..197b034ee87 100644
--- a/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.txt
+++ b/ydb/library/yql/providers/ydb/expr_nodes/CMakeLists.txt
@@ -5,14 +5,12 @@ target_link_libraries(providers-ydb-expr_nodes PUBLIC
   yql-core-expr_nodes
   providers-common-provider
 )
-target_sources(providers-ydb-expr_nodes INTERFACE
+target_sources(providers-ydb-expr_nodes PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/ydb/expr_nodes/yql_ydb_expr_nodes.cpp
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/ydb/expr_nodes/yql_ydb_expr_nodes.gen.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/ydb/expr_nodes/yql_ydb_expr_nodes.decl.inl.h
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/ydb/expr_nodes/yql_ydb_expr_nodes.defs.inl.h
 )
-target_sources(providers-ydb-expr_nodes PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/providers/ydb/expr_nodes/yql_ydb_expr_nodes.cpp
-)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/ydb/library/yql/providers/ydb/expr_nodes/yql_ydb_expr_nodes.gen.h