Description: Use system xdmf
Bug-Debian: https://bugs.debian.org/750182
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2014-06-02
Index: ParaView-v5.1.2/VTK/ThirdParty/xdmf2/CMakeLists.txt
===================================================================
--- ParaView-v5.1.2.orig/VTK/ThirdParty/xdmf2/CMakeLists.txt
+++ ParaView-v5.1.2/VTK/ThirdParty/xdmf2/CMakeLists.txt
@@ -1,44 +1,7 @@
 vtk_module_third_party(xdmf2
-  LIBRARIES vtkxdmf2
+  LIBRARIES Xdmf
   INCLUDE_DIRS
    ${CMAKE_CURRENT_SOURCE_DIR}/vtkxdmf2/libsrc
    ${CMAKE_CURRENT_BINARY_DIR}/vtkxdmf2/libsrc
   NO_ADD_SUBDIRECTORY
 )
-
-if(VTK_USE_SYSTEM_XDMF2)
-  return()
-endif()
-
-#########################################################################
-# Set Xdmf build environment options the way VTK wants them
-
-# build options
-option(VTK_XDMF_USE_MPI "Build Xdmf with MPI" OFF)
-mark_as_advanced(VTK_XDMF_USE_MPI)
-set (XDMF_BUILD_MPI ${VTK_XDMF_USE_MPI})
-
-# wrapping
-# VTK doesn't wrap libxdmf itself (either with vtk's wrapping or swig)
-set(XDMF_WRAP_TCL OFF CACHE INTERNAL "")
-set(XDMF_WRAP_PYTHON OFF CACHE INTERNAL "")
-set(XDMF_WRAP_PYTHON_INSTALL_DIR ${VTK_INSTALL_LIBRARY_DIR}/site-packages/Xdmf)
-set(XDMF_WRAP_CSHARP OFF CACHE INTERNAL "")
-set(XDMF_REGENERATE_WRAPPERS OFF CACHE INTERNAL "")
-set(XDMF_REGENERATE_YACCLEX OFF CACHE INTERNAL "")
-
-# packaging
-set(XDMF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR})
-set(XDMF_INSTALL_BIN_DIR ${VTK_INSTALL_RUNTIME_DIR})
-set(XDMF_INSTALL_INCLUDE_DIR "${VTK_INSTALL_INCLUDE_DIR}/vtkxdmf2")
-set(XDMF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
-set(XDMF_INSTALL_NO_DEVELOPMENT ${VTK_INSTALL_NO_DEVELOPMENT})
-set(XDMF_INSTALL_NO_RUNTIME ${VTK_INSTALL_NO_RUNTIME})
-
-vtk_module_export_info()
-
-#now configure the libxdmf build per the above settings
-set(XDMF_BUILT_INVTK 1)
-add_subdirectory(vtkxdmf2)
-
-vtk_target(vtkxdmf2 NO_INSTALL)
Index: ParaView-v5.1.2/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
===================================================================
--- ParaView-v5.1.2.orig/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
+++ ParaView-v5.1.2/VTK/ThirdParty/xdmf2/vtk_xdmf2.h.in
@@ -15,5 +15,6 @@
 #ifndef vtk_xdmf2_h
 #define vtk_xdmf2_h
 
+# include <Xdmf.h>
 
 #endif
Index: ParaView-v5.1.2/VTK/IO/Xdmf2/CMakeLists.txt
===================================================================
--- ParaView-v5.1.2.orig/VTK/IO/Xdmf2/CMakeLists.txt
+++ ParaView-v5.1.2/VTK/IO/Xdmf2/CMakeLists.txt
@@ -19,6 +19,3 @@ set_source_files_properties(
   vtkXdmfReaderInternal
     PROPERTIES WRAP_EXCLUDE_PYTHON 1
   )
-
-#set(${vtk-module}_NO_HeaderTest 1) # TODO: helper classes and reenable
-vtk_module_library(vtkIOXdmf2 ${Module_SRCS})
Index: ParaView-v5.1.2/VTK/IO/Xdmf3/CMakeLists.txt
===================================================================
--- ParaView-v5.1.2.orig/VTK/IO/Xdmf3/CMakeLists.txt
+++ ParaView-v5.1.2/VTK/IO/Xdmf3/CMakeLists.txt
@@ -18,6 +18,3 @@ set_source_files_properties(
   vtkXdmf3SILBuilder
   WRAP_EXCLUDE
 )
-
-include_directories(${XdmfCore_INCLUDE_DIRS} ${XdmfDSM_INCLUDE_DIRS})
-vtk_module_library(vtkIOXdmf3 ${Module_SRCS})
Index: ParaView-v5.1.2/CMake/VTKModules.cmake
===================================================================
--- ParaView-v5.1.2.orig/CMake/VTKModules.cmake
+++ ParaView-v5.1.2/CMake/VTKModules.cmake
@@ -325,9 +325,6 @@ set(_vtk_modules
   #  vtkXMLMultiBlockDataWriter
   #  vtkXMLHierarchicalBoxDataWriter
 
-  vtkIOXdmf2
-  #  Needed for xdmf support.
-
   vtkIOAMR
   #  Needed for AMR Readers.