Commit dd982645 authored by Ben Boeckel's avatar Ben Boeckel

Merge branch 'upstream-protobuf' into fix-protobuf-static-build

* upstream-protobuf:
  protobuf 2019-08-27 (d6a15043)
parents 18270601 599d00c3
Pipeline #144943 passed with stage
......@@ -295,10 +295,25 @@ set_target_properties(vtklibprotoc
PROPERTIES
DEFINE_SYMBOL LIBPROTOC_EXPORTS)
find_package(Threads REQUIRED)
vtk_module_add_executable(vtkprotoc
google/protobuf/compiler/main.cc)
set(vtkprotoc_no_as_needed)
if (COMMAND target_link_options)
target_link_options(vtkprotoc
PRIVATE
$<$<COMPILER_ID:GNU>-Wl,--no-as-needed>)
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(vtkprotoc_no_as_needed
-Wl,--no-as-needed)
endif ()
target_link_libraries(vtkprotoc
PRIVATE
${vtkprotoc_no_as_needed}
vtklibprotoc
ParaView::protobuf)
ParaView::protobuf
Threads::Threads)
add_executable(ParaView::protoc ALIAS vtkprotoc)
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