Commit 3f747fda authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot

Merge topic 'update-protobuf'

c63d6fce Merge branch 'upstream-protobuf' into update-protobuf
49ec354d protobuf 2019-02-10 (7d8fafd2)
f62d4d2a update protobuf tag.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !3004
parents af49afef c63d6fce
Pipeline #129803 running with stage
......@@ -8,7 +8,7 @@ readonly name="protobuf"
readonly ownership="protobuf Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/protobuf.git"
readonly tag="for/paraview-20190124-3.6.1.2"
readonly tag="for/paraview-20190211-3.6.1.2"
readonly paths="
CMakeLists.txt
......
......@@ -91,7 +91,7 @@ function(paraview_protobuf_generate)
OUTPUT ${_generated_srcs}
COMMAND $<TARGET_FILE:ParaView::protoc>
ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${CMAKE_CURRENT_BINARY_DIR} ${_protobuf_include_path} ${_abs_file}
DEPENDS ${ABS_FIL} ParaView::protoc
DEPENDS ${_abs_file} ParaView::protoc
COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}"
VERBATIM )
endforeach()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment