Propagate addincl for configure file to cmake

ref:de2569dc6623093ba87223efd8f87864dc01f935

7 files changed, 21 insertions, 1 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index abb33731c9..85507fad94 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -6625,7 +6625,7 @@ macro CFG_VARS() {
 ### Used implicitly for .in-files processing.
 macro CONFIGURE_FILE(Src, Dst) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/configure_file.py"} ${input:Src} ${output;addincl:Dst} $CFG_VARS ${kv;hide:"p CF"} ${kv;hide:"pc yellow"}
-    .SEM=set_vars ${CFG_VARS} && configure_file $S/${input;rootrel:Src} $B/${output;rootrel:Dst}
+    .SEM=set_vars ${CFG_VARS} && configure_file $S/${input;rootrel:Src} $B/${output;addincl;rootrel:Dst}
 }
 
 ### @usage: BASE_CODEGEN(tool_path prefix)
diff --git a/library/cpp/build_info/CMakeLists.txt b/library/cpp/build_info/CMakeLists.txt
index 6223c56b95..4e8b5bedca 100644
--- a/library/cpp/build_info/CMakeLists.txt
+++ b/library/cpp/build_info/CMakeLists.txt
@@ -9,6 +9,9 @@
 find_package(Python2 REQUIRED)
 
 add_library(library-cpp-build_info)
+target_include_directories(library-cpp-build_info PUBLIC
+  ${CMAKE_BINARY_DIR}/library/cpp/build_info
+)
 target_link_libraries(library-cpp-build_info PUBLIC
   contrib-libs-cxxsupp
   yutil
diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
index 16a1f9e2dd..4e57c50ab3 100644
--- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/CMakeLists.txt
@@ -8,6 +8,10 @@
 
 
 add_library(proto_ast-gen-jsonpath)
+target_include_directories(proto_ast-gen-jsonpath PUBLIC
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/Cpp
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/jsonpath/org/antlr/codegen/templates/protobuf
+)
 target_link_libraries(proto_ast-gen-jsonpath PUBLIC
   contrib-libs-cxxsupp
   yutil
diff --git a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
index 3c1afe0dac..57aca06cab 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v0/CMakeLists.txt
@@ -8,6 +8,10 @@
 
 
 add_library(proto_ast-gen-v0)
+target_include_directories(proto_ast-gen-v0 PUBLIC
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/Cpp
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v0/org/antlr/codegen/templates/protobuf
+)
 target_link_libraries(proto_ast-gen-v0 PUBLIC
   contrib-libs-cxxsupp
   yutil
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.txt
index cbc87e3a95..37e4c21f45 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.txt
@@ -8,6 +8,9 @@
 
 
 add_library(proto_ast-gen-v1)
+target_include_directories(proto_ast-gen-v1 PUBLIC
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/org/antlr/codegen/templates/Cpp
+)
 target_link_libraries(proto_ast-gen-v1 PUBLIC
   contrib-libs-cxxsupp
   yutil
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.txt
index c87ba4e8de..0af5374a61 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.txt
@@ -8,6 +8,9 @@
 
 
 add_library(proto_ast-gen-v1_ansi)
+target_include_directories(proto_ast-gen-v1_ansi PUBLIC
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/org/antlr/codegen/templates/Cpp
+)
 target_link_libraries(proto_ast-gen-v1_ansi PUBLIC
   contrib-libs-cxxsupp
   yutil
diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
index db5fcef1ba..9fd6e57cbb 100644
--- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
+++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt
@@ -8,6 +8,9 @@
 
 
 add_library(proto_ast-gen-v1_proto)
+target_include_directories(proto_ast-gen-v1_proto PUBLIC
+  ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/org/antlr/codegen/templates/protobuf
+)
 target_link_libraries(proto_ast-gen-v1_proto PUBLIC
   contrib-libs-cxxsupp
   yutil