diff options
| -rw-r--r-- | build/conf/fbs.conf | 2 | ||||
| -rw-r--r-- | build/export_generators/hardcoded-cmake/cmake/fbs.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/conf/fbs.conf b/build/conf/fbs.conf index 1d04c139a59..798c8b27bc1 100644 --- a/build/conf/fbs.conf +++ b/build/conf/fbs.conf @@ -38,7 +38,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;main;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:FBS_FAKEID} - .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 ${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"} && set_global_flags FBS_CPP_FLAGS --no-warnings --cpp --keep-prefix --gen-mutable --schema -b --yandex-maps-iter --gen-object-api --filename-suffix .fbs ${input;hide:"build/scripts/cpp_flatc_wrapper.py"} .PEERDIR=contrib/libs/flatbuffers } diff --git a/build/export_generators/hardcoded-cmake/cmake/fbs.cmake b/build/export_generators/hardcoded-cmake/cmake/fbs.cmake index d6123669123..986983d5f3b 100644 --- a/build/export_generators/hardcoded-cmake/cmake/fbs.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/fbs.cmake @@ -1,7 +1,7 @@ include(common) function(target_fbs_source Tgt Key Src) - get_built_tool_path(flatc_bin flatc_dependency contrib/tools/flatc/bin flatc) + get_built_tool_path(flatc_bin flatc_dependency contrib/tools/flatc flatc) file(RELATIVE_PATH fbsRel ${PROJECT_SOURCE_DIR} ${Src}) get_filename_component(OutputBase ${fbsRel} NAME_WLE) |