diff options
Diffstat (limited to 'sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch')
| -rw-r--r-- | sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch b/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch new file mode 100644 index 0000000..fe8f4b4 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch @@ -0,0 +1,53 @@ +--- CMake/ParaViewCommon.cmake.orig 2012-02-03 15:31:08.531644115 +1300 ++++ CMake/ParaViewCommon.cmake 2012-02-03 15:30:36.420633741 +1300 +@@ -526,13 +526,13 @@ + + ######################################################################### + # Configure protobuf +-SET (PROTOBUF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) +-SET (PROTOBUF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) +-SET (PROTOBUF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME}) +-IF (NOT PV_INSTALL_NO_LIBRARIES) +- SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS protobuf) +-ENDIF (NOT PV_INSTALL_NO_LIBRARIES) +-ADD_SUBDIRECTORY(Utilities/protobuf) ++# SET (PROTOBUF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) ++# SET (PROTOBUF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) ++# SET (PROTOBUF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME}) ++# IF (NOT PV_INSTALL_NO_LIBRARIES) ++# SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS protobuf) ++# ENDIF (NOT PV_INSTALL_NO_LIBRARIES) ++# ADD_SUBDIRECTORY(Utilities/protobuf) + + ######################################################################### + # Configure mpeg2 encoding +--- CMake/ParaViewMacros.cmake.orig 2012-02-09 13:12:07.518350208 +1300 ++++ CMake/ParaViewMacros.cmake 2012-02-09 13:12:16.863356368 +1300 +@@ -214,6 +214,6 @@ + COMMAND protoc_compiler + --cpp_out=dllexport_decl=VTK_PROTOBUF_EXPORT:${CMAKE_CURRENT_BINARY_DIR} + --proto_path ${path} ${absolute} +- DEPENDS ${in_proto_file} protoc_compiler ++ DEPENDS ${in_proto_file} + ) + ENDFUNCTION (protobuf_generate) +--- ParaViewCore/ServerImplementation/CMakeLists.txt.orig 2012-02-09 13:14:15.230434986 +1300 ++++ ParaViewCore/ServerImplementation/CMakeLists.txt 2012-02-09 13:15:04.214467797 +1300 +@@ -86,7 +86,7 @@ + #------------------------------------------------------------------------------ + # Compile protobuf resources. + # run it from a script so we can set necessary paths. +-get_target_property(PROTOC_LOCATION protoc_compiler LOCATION) ++SET(PROTOC_LOCATION ${SYSTEM_PB}) + if (WIN32) + get_filename_component(PROTOC_DIR ${PROTOC_LOCATION} PATH) + get_filename_component(PROTOC_PDIR ${PROTOC_DIR} PATH) +@@ -101,7 +101,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc + COMMAND ${CMAKE_COMMAND} + ARGS -DOutDir=${CMAKE_CFG_INTDIR} -P ${CMAKE_CURRENT_BINARY_DIR}/ExecuteProtoC.cmake +- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/vtkPVMessage.proto protoc_compiler ${ParaView_CMAKE_DIR}/ExecuteProtoC.cmake.in ++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/vtkPVMessage.proto ${ParaView_CMAKE_DIR}/ExecuteProtoC.cmake.in + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + |