File tree Expand file tree Collapse file tree 3 files changed +8
-2
lines changed Expand file tree Collapse file tree 3 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -45,6 +45,8 @@ CPP_PROTO_SUFFIXES=.pb.h .pb.cc
45
45
CPP_PROTO_PLUGINS=
46
46
CPP_PROTO_NO_DBGINFO=no
47
47
48
+ PROTOC_EXTRA_OUTS_SEM=
49
+
48
50
# tag:proto tag:cpp-specific
49
51
CPP_EV_OPTS=--plugin=protoc-gen-event2cpp=${tool:"tools/event2cpp"} --event2cpp_out=$ARCADIA_BUILD_ROOT -I=$ARCADIA_ROOT/library/cpp/eventlog
50
52
CPP_EV_OUTS=
@@ -208,8 +210,9 @@ macro WITH_KOTLIN_GRPC() {
208
210
209
211
# tag:proto tag:cpp-specific
210
212
macro _ADD_CPP_PROTO_OUT(Suf) {
211
- .SEM=append_target_property PROTOC_EXTRA_OUTS $Suf && protoc_extra_outs $Suf ${output;hide;suf=.o:Suf} $_ADD_SEM_PROP_IF_NON_EMPTY(PROTO_NAMESPACE $PROTO_NAMESPACE)
213
+ .SEM=append_target_property PROTOC_EXTRA_OUTS $Suf ${output;hide;suf=.o:Suf} $_ADD_SEM_PROP_IF_NON_EMPTY(PROTO_NAMESPACE $PROTO_NAMESPACE)
212
214
SET_APPEND(CPP_PROTO_OUTS \${output;norel;nopath;noext;suf=$Suf:File})
215
+ SET_APPEND(PROTOC_EXTRA_OUTS_SEM && protoc_extra_outs $Suf)
213
216
214
217
# XXX fix variable expansion in plugins
215
218
SET(CPP_PROTO_SUFFIXES $CPP_PROTO_SUFFIXES $Suf)
@@ -387,6 +390,7 @@ macro YT_ORM_PROTO_YSON(OUT_OPTS[], Files...) {
387
390
_SEM_CPP_PROTO_CMD=target_proto_messages PRIVATE ${input:File} \
388
391
&& target_options-privates-ITEM && target_options-privates-option target_proto_messages && target_options-privates-args ${input:File} \
389
392
$CPP_PROTO_OUTS_SEM ${output;hide;suf=${OBJ_SUF}.pb.o:File} $DEFAULT_PROTOC_TOOLS \
393
+ $PROTOC_EXTRA_OUTS_SEM \
390
394
&& set_global_flags COMMON_PROTOC_FLAGS \
391
395
&& platform_vars-COMMON_PROTOC_FLAGS "" \
392
396
&& target_proto_outs --cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $PROTOC_STYLEGUIDE_OUT \
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ set_property(TARGET {{ name }} PROPERTY {{ property.name }}
15
15
16
16
{% - if (current_target .protoc_extra_outs is defined ) and (current_target .protoc_extra_outs |length ) %}
17
17
set_property(TARGET {{ name }} PROPERTY PROTOC_EXTRA_OUTS
18
- {% - for protoc_extra_out in current_target .protoc_extra_outs %}
18
+ {% - for protoc_extra_out in current_target .protoc_extra_outs | unique %}
19
19
{{ protoc_extra_out }}
20
20
{% - endfor %}
21
21
)
Original file line number Diff line number Diff line change @@ -631,6 +631,8 @@ module _BASE_UNIT: _BARE_UNIT {
631
631
when ($PROTOC_TRANSITIVE_HEADERS == "no") {
632
632
CPP_PROTO_PLUGINS=proto_h=true:${CPP_PROTO_PLUGINS}
633
633
CPP_PROTO_OUTS+=${output;main;norel;nopath;noext:File.deps.pb.h}
634
+ CPP_PROTO_OUTS_SEM+=${output;main;hide;norel;nopath;noext:File.deps.pb.h}
635
+ PROTOC_EXTRA_OUTS_SEM=&& protoc_extra_outs .deps.pb.h
634
636
}
635
637
}
636
638
You can’t perform that action at this time.
0 commit comments