Pass local module fbs compiler flags to cmake export

5 files changed, 25 insertions, 1 deletions

diff --git a/build/conf/fbs.conf b/build/conf/fbs.conf
index 3dd0d3114e..7a5f175ac4 100644
--- a/build/conf/fbs.conf
+++ b/build/conf/fbs.conf
@@ -36,7 +36,7 @@ _GO_FLATC_IMPORTS=\
 # tag:fbs tag:cpp-specific
 macro _CPP_FLATC_CMD(SRC, SRCFLAGS...) {
     .CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/cpp_flatc_wrapper.py"} ${tool:"contrib/tools/flatc"} --no-warnings --cpp --keep-prefix --gen-mutable --schema -b --yandex-maps-iter --gen-object-api --filename-suffix .fbs ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} -o ${output;norel:SRC.h} ${output;hide;norel:SRC.cpp} ${input:SRC} ${output;hide;noext;norel:SRC.iter.fbs.h} ${output;noauto;hide;noext;norel:SRC.bfbs} ${kv;hide:"p FL"} ${kv;hide:"pc light-green"} ${hide:CPP_FAKEID}
-    .SEM=target_fbs_source PRIVATE ${input:SRC} ${pre=-I :_FLATC__INCLUDE} ${output;hide;norel:SRC.h} ${output;hide;norel:SRC.cpp} ${output;hide;noext;norel:SRC.iter.fbs.h} ${output;noauto;hide;noext;norel:SRC.bfbs} ${hide;tool:"contrib/tools/flatc/bin"} && set_global_flags FBS_CPP_FLAGS --no-warnings --cpp --keep-prefix --gen-mutable --schema -b --yandex-maps-iter --gen-object-api --filename-suffix .fbs ${FLATC_FLAGS_VALUE} ${input;hide:"build/scripts/cpp_flatc_wrapper.py"}
+    .SEM=target_fbs_source PRIVATE ${input:SRC} ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} ${output;hide;norel:SRC.h} ${output;hide;norel:SRC.cpp} ${output;hide;noext;norel:SRC.iter.fbs.h} ${output;noauto;hide;noext;norel:SRC.bfbs} ${hide;tool:"contrib/tools/flatc/bin"} && set_global_flags FBS_CPP_FLAGS --no-warnings --cpp --keep-prefix --gen-mutable --schema -b --yandex-maps-iter --gen-object-api --filename-suffix .fbs ${FLATC_FLAGS_VALUE} ${input;hide:"build/scripts/cpp_flatc_wrapper.py"}
     .PEERDIR=contrib/libs/flatbuffers
 }
 
diff --git a/contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt b/contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt
index 25ad7cb3bf..d00e982afd 100644
--- a/contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt
@@ -310,6 +310,7 @@ target_sources(libs-apache-arrow PRIVATE
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/File.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -318,6 +319,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Message.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -326,6 +328,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Schema.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -334,6 +337,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/SparseTensor.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -342,6 +346,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Tensor.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -350,6 +355,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/feather.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
diff --git a/contrib/libs/apache/arrow/CMakeLists.linux-aarch64.txt b/contrib/libs/apache/arrow/CMakeLists.linux-aarch64.txt
index 82596c804a..7787cf4cfe 100644
--- a/contrib/libs/apache/arrow/CMakeLists.linux-aarch64.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.linux-aarch64.txt
@@ -311,6 +311,7 @@ target_sources(libs-apache-arrow PRIVATE
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/File.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -319,6 +320,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Message.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -327,6 +329,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Schema.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -335,6 +338,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/SparseTensor.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -343,6 +347,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Tensor.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -351,6 +356,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/feather.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
diff --git a/contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt b/contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt
index 82596c804a..7787cf4cfe 100644
--- a/contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt
@@ -311,6 +311,7 @@ target_sources(libs-apache-arrow PRIVATE
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/File.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -319,6 +320,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Message.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -327,6 +329,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Schema.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -335,6 +338,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/SparseTensor.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -343,6 +347,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Tensor.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -351,6 +356,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/feather.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
diff --git a/contrib/libs/apache/arrow/CMakeLists.windows-x86_64.txt b/contrib/libs/apache/arrow/CMakeLists.windows-x86_64.txt
index e0d4023872..04df7d46c3 100644
--- a/contrib/libs/apache/arrow/CMakeLists.windows-x86_64.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.windows-x86_64.txt
@@ -309,6 +309,7 @@ target_sources(libs-apache-arrow PRIVATE
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/File.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -317,6 +318,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Message.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -325,6 +327,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Schema.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -333,6 +336,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/SparseTensor.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -341,6 +345,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/Tensor.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I
@@ -349,6 +354,7 @@ target_fbs_source(libs-apache-arrow
 target_fbs_source(libs-apache-arrow
   PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/arrow/cpp/src/generated/feather.fbs
+  --scoped-enums
   -I
   ${CMAKE_BINARY_DIR}
   -I