projects / packages / ParaView.git / blame
| Commit | Line | Data |
|---|---|---|
| 62573659 JR |
1 | diff -up ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt |
| 2 | --- ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf 2012-11-27 09:09:41.000000000 -0700 | |
| 3 | +++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2012-11-27 13:00:36.072178577 -0700 | |
| 4 | @@ -80,16 +80,16 @@ set (${vtk-module}_HDRS | |
| 5 | #------------------------------------------------------------------------------ | |
| 6 | # Generate the protbuf message file. | |
| 7 | #------------------------------------------------------------------------------ | |
| 8 | -get_target_property(PROTOC_LOCATION protoc_compiler LOCATION) | |
| 9 | +get_target_property(PROTOC_LOCATION protoc LOCATION) | |
| 10 | add_custom_command( | |
| 11 | OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h | |
| 12 | ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc | |
| 13 | ||
| 14 | - COMMAND protoc_compiler | |
| 15 | + COMMAND protoc | |
| 16 | "--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}" | |
| 17 | --proto_path "@CMAKE_CURRENT_SOURCE_DIR@" | |
| 18 | "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto" | |
| 19 | - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler | |
| 20 | + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto | |
| 21 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} | |
| 22 | ) | |
| 23 | ||
| 24 | @@ -108,5 +108,7 @@ endif() | |
| 25 | vtk_module_library(vtkPVServerImplementationCore | |
| 26 | ${Module_SRCS}) | |
| 27 | ||
| 28 | +target_link_libraries(vtkPVServerImplementationCore -lpthread) | |
| 29 | + | |
| 30 | add_dependencies(vtkPVServerImplementationCore | |
| 31 | protobuf_code_generation) | |
| 32 | diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf ParaView/ThirdParty/protobuf/CMakeLists.txt | |
| 33 | --- ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-27 09:09:45.000000000 -0700 | |
| 34 | +++ ParaView/ThirdParty/protobuf/CMakeLists.txt 2012-11-27 13:02:04.535632175 -0700 | |
| 35 | @@ -34,7 +34,7 @@ set (PROTOBUF_INSTALL_BIN_DIR ${VTK_INST | |
| 36 | set (PROTOBUF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR}) | |
| 37 | set (PROTOBUF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME}) | |
| 38 | ||
| 39 | -vtk_module_third_party(protobuf | |
| 40 | +vtk_module_third_party(Protobuf | |
| 41 | INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkprotobuf/src | |
| 42 | LIBRARIES protobuf | |
| 43 | ) | |
| 44 | @@ -42,11 +42,11 @@ vtk_module_third_party(protobuf | |
| 45 | # protobuf exports it's build-dir targets to a custom file | |
| 46 | # (PROTOBUF_EXPORTS.cmake). We don't care much about that. We export | |
| 47 | # build-dir targets ourselves. | |
| 48 | -vtk_target_export(protobuf) | |
| 49 | -vtk_target_export(protobuf-lite) | |
| 50 | -if (NOT CMAKE_CROSSCOMPILING) | |
| 51 | - vtk_compile_tools_target_export(protoc_compiler) | |
| 52 | -endif() | |
| 53 | +#vtk_target_export(protobuf) | |
| 54 | +#vtk_target_export(protobuf-lite) | |
| 55 | +#if (NOT CMAKE_CROSSCOMPILING) | |
| 56 | +# vtk_compile_tools_target_export(protoc_compiler) | |
| 57 | +#endif() | |
| 58 | ||
| 59 | # All these exports don't add any install rules. However we make protobuf itself | |
| 60 | # install components at the right location by setting PROTOBUF_INSTALL_* |