|
|
3959c95 |
diff -up ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
|
|
|
3959c95 |
--- ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf 2012-11-27 09:09:41.000000000 -0700
|
|
|
3959c95 |
+++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2012-11-27 13:00:36.072178577 -0700
|
|
|
3959c95 |
@@ -80,16 +80,16 @@ set (${vtk-module}_HDRS
|
|
|
3959c95 |
#------------------------------------------------------------------------------
|
|
|
3959c95 |
# Generate the protbuf message file.
|
|
|
3959c95 |
#------------------------------------------------------------------------------
|
|
|
3959c95 |
-get_target_property(PROTOC_LOCATION protoc_compiler LOCATION)
|
|
|
3959c95 |
+get_target_property(PROTOC_LOCATION protoc LOCATION)
|
|
|
3959c95 |
add_custom_command(
|
|
|
3959c95 |
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h
|
|
|
3959c95 |
${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc
|
|
|
3959c95 |
|
|
|
3959c95 |
- COMMAND protoc_compiler
|
|
|
3959c95 |
+ COMMAND protoc
|
|
|
3959c95 |
"--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}"
|
|
|
3959c95 |
--proto_path "@CMAKE_CURRENT_SOURCE_DIR@"
|
|
|
3959c95 |
"${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto"
|
|
|
3959c95 |
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler
|
|
|
3959c95 |
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto
|
|
|
3959c95 |
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
|
|
3959c95 |
)
|
|
|
3959c95 |
|
|
|
3959c95 |
@@ -108,5 +108,7 @@ endif()
|
|
|
3959c95 |
vtk_module_library(vtkPVServerImplementationCore
|
|
|
3959c95 |
${Module_SRCS})
|
|
|
3959c95 |
|
|
|
3959c95 |
+target_link_libraries(vtkPVServerImplementationCore -lpthread)
|
|
|
3959c95 |
+
|
|
|
3959c95 |
add_dependencies(vtkPVServerImplementationCore
|
|
|
3959c95 |
protobuf_code_generation)
|
|
|
3959c95 |
diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf ParaView/ThirdParty/protobuf/CMakeLists.txt
|
|
|
3959c95 |
--- ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-27 09:09:45.000000000 -0700
|
|
|
3959c95 |
+++ ParaView/ThirdParty/protobuf/CMakeLists.txt 2012-11-27 13:02:04.535632175 -0700
|
|
|
3959c95 |
@@ -34,7 +34,7 @@ set (PROTOBUF_INSTALL_BIN_DIR ${VTK_INST
|
|
|
3959c95 |
set (PROTOBUF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR})
|
|
|
3959c95 |
set (PROTOBUF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
|
|
|
3959c95 |
|
|
|
3959c95 |
-vtk_module_third_party(protobuf
|
|
|
3959c95 |
+vtk_module_third_party(Protobuf
|
|
|
3959c95 |
INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkprotobuf/src
|
|
|
3959c95 |
LIBRARIES protobuf
|
|
|
3959c95 |
)
|
|
|
3959c95 |
@@ -42,11 +42,11 @@ vtk_module_third_party(protobuf
|
|
|
3959c95 |
# protobuf exports it's build-dir targets to a custom file
|
|
|
3959c95 |
# (PROTOBUF_EXPORTS.cmake). We don't care much about that. We export
|
|
|
3959c95 |
# build-dir targets ourselves.
|
|
|
3959c95 |
-vtk_target_export(protobuf)
|
|
|
3959c95 |
-vtk_target_export(protobuf-lite)
|
|
|
3959c95 |
-if (NOT CMAKE_CROSSCOMPILING)
|
|
|
3959c95 |
- vtk_compile_tools_target_export(protoc_compiler)
|
|
|
3959c95 |
-endif()
|
|
|
3959c95 |
+#vtk_target_export(protobuf)
|
|
|
3959c95 |
+#vtk_target_export(protobuf-lite)
|
|
|
3959c95 |
+#if (NOT CMAKE_CROSSCOMPILING)
|
|
|
3959c95 |
+# vtk_compile_tools_target_export(protoc_compiler)
|
|
|
3959c95 |
+#endif()
|
|
|
3959c95 |
|
|
|
3959c95 |
# All these exports don't add any install rules. However we make protobuf itself
|
|
|
3959c95 |
# install components at the right location by setting PROTOBUF_INSTALL_*
|