Commit c1adeae8 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

vtkIOXdmf3: update to the new module system

parent b28b9c5b
set(Module_SRCS
vtkXdmf3ArrayKeeper.cxx
vtkXdmf3ArraySelection.cxx
vtkXdmf3DataSet.cxx
vtkXdmf3HeavyDataHandler.cxx
vtkXdmf3LightDataHandler.cxx
vtkXdmf3Reader.cxx
vtkXdmf3SILBuilder.cxx
vtkXdmf3Writer.cxx
)
set(classes
vtkXdmf3ArrayKeeper
vtkXdmf3ArraySelection
vtkXdmf3DataSet
vtkXdmf3HeavyDataHandler
vtkXdmf3LightDataHandler
vtkXdmf3Reader
vtkXdmf3SILBuilder
vtkXdmf3Writer)
include_directories(${XdmfCore_INCLUDE_DIRS} ${XdmfDSM_INCLUDE_DIRS})
mark_as_advanced(CLEAR Boost_INCLUDE_DIR)
find_package(Boost REQUIRED)
if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
mark_as_advanced(FORCE Boost_INCLUDE_DIR)
endif(Boost_FOUND)
vtk_module_library(vtkIOXdmf3 ${Module_SRCS})
vtk_module_add_module(VTK::IOXdmf3
CLASSES ${classes})
......@@ -5,11 +5,13 @@ vtk_add_test_python(
if (VTK_USE_LARGE_DATA)
set(_ManyFiles_ARGS "--do_big_files")
set(_BigFiles "DATA{${VTK_TEST_INPUT_DIR}/XDMF/Big/,REGEX:.*}")
set(_BigFiles
"Data/XDMF/Big/,REGEX:.*"
"Data/XDMF/Iron/,REGEX:.*")
endif()
ExternalData_Expand_Arguments(VTKData _
"DATA{${VTK_TEST_INPUT_DIR}/XDMF/,REGEX:.*}"
"${_BigFiles}"
vtk_module_test_data(
Data/XDMF/,REGEX:.*
${_BigFiles}
)
vtk_add_test_python(
ManyFiles.py NO_OUTPUT NO_VALID NO_RT ${_ManyFiles_ARGS}
......
vtk_module(vtkIOXdmf3
GROUPS
TEST_DEPENDS
vtkFiltersGeneral
vtkTestingCore
vtkTestingRendering
DEPENDS
vtkCommonCore
vtkCommonExecutionModel
PRIVATE_DEPENDS
vtkCommonDataModel
vtkCommonSystem
vtkFiltersExtraction
vtkParallelCore
vtksys
vtkxdmf3
KIT
vtkParallel
)
NAME
VTK::IOXdmf3
LIBRARY_NAME
vtkIOXdmf3
IMPLEMENTABLE
KIT
VTK::Parallel
DEPENDS
VTK::CommonCore
VTK::CommonExecutionModel
VTK::xdmf3
PRIVATE_DEPENDS
VTK::CommonDataModel
VTK::CommonSystem
VTK::FiltersExtraction
VTK::ParallelCore
VTK::vtksys
TEST_DEPENDS
VTK::FiltersGeneral
VTK::TestingCore
VTK::TestingRendering
......@@ -16,7 +16,8 @@
#include "vtkXdmf3ArrayKeeper.h"
#include "XdmfArray.hpp"
#include "vtk_xdmf3.h"
#include VTKXDMF3_HEADER(core/XdmfArray.hpp)
//------------------------------------------------------------------------------
vtkXdmf3ArrayKeeper::vtkXdmf3ArrayKeeper()
......
......@@ -40,23 +40,24 @@
#include "vtkUnstructuredGrid.h"
#include "vtkVertexListIterator.h"
#include "XdmfArrayType.hpp"
#include "XdmfAttribute.hpp"
#include "XdmfAttributeCenter.hpp"
#include "XdmfAttributeType.hpp"
#include "XdmfCurvilinearGrid.hpp"
#include "XdmfDomain.hpp"
#include "XdmfGeometry.hpp"
#include "XdmfGeometryType.hpp"
#include "XdmfGraph.hpp"
#include "XdmfRectilinearGrid.hpp"
#include "XdmfRegularGrid.hpp"
#include "XdmfSet.hpp"
#include "XdmfSetType.hpp"
#include "XdmfUnstructuredGrid.hpp"
#include "XdmfTime.hpp"
#include "XdmfTopology.hpp"
#include "XdmfTopologyType.hpp"
#include "vtk_xdmf3.h"
#include VTKXDMF3_HEADER(core/XdmfArrayType.hpp)
#include VTKXDMF3_HEADER(XdmfAttribute.hpp)
#include VTKXDMF3_HEADER(XdmfAttributeCenter.hpp)
#include VTKXDMF3_HEADER(XdmfAttributeType.hpp)
#include VTKXDMF3_HEADER(XdmfCurvilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfDomain.hpp)
#include VTKXDMF3_HEADER(XdmfGeometry.hpp)
#include VTKXDMF3_HEADER(XdmfGeometryType.hpp)
#include VTKXDMF3_HEADER(XdmfGraph.hpp)
#include VTKXDMF3_HEADER(XdmfRectilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfRegularGrid.hpp)
#include VTKXDMF3_HEADER(XdmfSet.hpp)
#include VTKXDMF3_HEADER(XdmfSetType.hpp)
#include VTKXDMF3_HEADER(XdmfUnstructuredGrid.hpp)
#include VTKXDMF3_HEADER(XdmfTime.hpp)
#include VTKXDMF3_HEADER(XdmfTopology.hpp)
#include VTKXDMF3_HEADER(XdmfTopologyType.hpp)
//==============================================================================
bool vtkXdmf3DataSet_ReadIfNeeded(XdmfArray *array, bool dbg=false)
......
......@@ -28,7 +28,8 @@
#define vtkXdmf3DataSet_h
#include "vtkIOXdmf3Module.h" // For export macro
#include "XdmfSharedPtr.hpp"
#include "vtk_xdmf3.h"
#include VTKXDMF3_HEADER(core/XdmfSharedPtr.hpp)
#include <string> //Needed only for XdmfArray::getName :(
class vtkXdmf3ArraySelection;
......
......@@ -30,17 +30,18 @@
#include "vtkXdmf3ArraySelection.h"
#include "vtkXdmf3DataSet.h"
#include "XdmfCurvilinearGrid.hpp"
#include "XdmfDomain.hpp"
#include "XdmfGraph.hpp"
#include "XdmfGrid.hpp"
#include "XdmfGridCollection.hpp"
#include "XdmfGridCollectionType.hpp"
#include "XdmfItem.hpp"
#include "XdmfRectilinearGrid.hpp"
#include "XdmfRegularGrid.hpp"
#include "XdmfSet.hpp"
#include "XdmfUnstructuredGrid.hpp"
#include "vtk_xdmf3.h"
#include VTKXDMF3_HEADER(XdmfCurvilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfDomain.hpp)
#include VTKXDMF3_HEADER(XdmfGraph.hpp)
#include VTKXDMF3_HEADER(XdmfGrid.hpp)
#include VTKXDMF3_HEADER(XdmfGridCollection.hpp)
#include VTKXDMF3_HEADER(XdmfGridCollectionType.hpp)
#include VTKXDMF3_HEADER(core/XdmfItem.hpp)
#include VTKXDMF3_HEADER(XdmfRectilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfRegularGrid.hpp)
#include VTKXDMF3_HEADER(XdmfSet.hpp)
#include VTKXDMF3_HEADER(XdmfUnstructuredGrid.hpp)
#include <cassert>
......
......@@ -29,22 +29,24 @@
#include "vtkIOXdmf3Module.h" // For export macro
#include "XdmfInformation.hpp"
#include "vtk_xdmf3.h"
#include "XdmfItem.hpp"
#include "XdmfSharedPtr.hpp"
#include VTKXDMF3_HEADER(core/XdmfInformation.hpp)
#include VTKXDMF3_HEADER(core/XdmfItem.hpp)
#include VTKXDMF3_HEADER(core/XdmfSharedPtr.hpp)
#include "vtkXdmf3ArrayKeeper.h"
#include "vtkXdmf3ArraySelection.h"
#include "XdmfCurvilinearGrid.hpp"
#include "XdmfGraph.hpp"
#include "XdmfGrid.hpp"
#include "XdmfRectilinearGrid.hpp"
#include "XdmfRegularGrid.hpp"
#include "XdmfSet.hpp"
#include "XdmfUnstructuredGrid.hpp"
#include "XdmfDomain.hpp"
#include VTKXDMF3_HEADER(XdmfCurvilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfGraph.hpp)
#include VTKXDMF3_HEADER(XdmfGrid.hpp)
#include VTKXDMF3_HEADER(XdmfRectilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfRegularGrid.hpp)
#include VTKXDMF3_HEADER(XdmfSet.hpp)
#include VTKXDMF3_HEADER(XdmfUnstructuredGrid.hpp)
#include VTKXDMF3_HEADER(XdmfDomain.hpp)
class vtkDataObject;
class vtkDataSet;
......
......@@ -20,21 +20,22 @@
#include "vtkXdmf3ArraySelection.h"
#include "vtksys/SystemTools.hxx"
#include "XdmfAttribute.hpp"
#include "XdmfAttributeCenter.hpp"
#include "XdmfCurvilinearGrid.hpp"
#include "XdmfDomain.hpp"
#include "XdmfGraph.hpp"
#include "XdmfGridCollection.hpp"
#include "XdmfGridCollectionType.hpp"
#include "XdmfGridController.hpp"
#include "XdmfReader.hpp"
#include "XdmfRectilinearGrid.hpp"
#include "XdmfRegularGrid.hpp"
#include "XdmfSet.hpp"
#include "XdmfTime.hpp"
#include "XdmfUnstructuredGrid.hpp"
#include "XdmfVisitor.hpp"
#include "vtk_xdmf3.h"
#include VTKXDMF3_HEADER(XdmfAttribute.hpp)
#include VTKXDMF3_HEADER(XdmfAttributeCenter.hpp)
#include VTKXDMF3_HEADER(XdmfCurvilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfDomain.hpp)
#include VTKXDMF3_HEADER(XdmfGraph.hpp)
#include VTKXDMF3_HEADER(XdmfGridCollection.hpp)
#include VTKXDMF3_HEADER(XdmfGridCollectionType.hpp)
#include VTKXDMF3_HEADER(XdmfGridController.hpp)
#include VTKXDMF3_HEADER(XdmfReader.hpp)
#include VTKXDMF3_HEADER(XdmfRectilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfRegularGrid.hpp)
#include VTKXDMF3_HEADER(XdmfSet.hpp)
#include VTKXDMF3_HEADER(XdmfTime.hpp)
#include VTKXDMF3_HEADER(XdmfUnstructuredGrid.hpp)
#include VTKXDMF3_HEADER(core/XdmfVisitor.hpp)
#include <iostream>
#include <cassert>
......
......@@ -30,7 +30,8 @@
#include "vtkIOXdmf3Module.h" // For export macro
#include <set>
#include "XdmfItem.hpp"
#include "vtk_xdmf3.h"
#include VTKXDMF3_HEADER(core/XdmfItem.hpp)
#include "vtkType.h"
class vtkXdmf3SILBuilder;
......
......@@ -38,14 +38,15 @@
#include "vtkXdmf3LightDataHandler.h"
#include "vtkXdmf3SILBuilder.h"
#include "XdmfCurvilinearGrid.hpp"
#include "XdmfDomain.hpp"
#include "XdmfGridCollection.hpp"
#include "XdmfGridCollectionType.hpp"
#include "XdmfReader.hpp"
#include "XdmfRectilinearGrid.hpp"
#include "XdmfRegularGrid.hpp"
#include "XdmfUnstructuredGrid.hpp"
#include "vtk_xdmf3.h"
#include VTKXDMF3_HEADER(XdmfCurvilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfDomain.hpp)
#include VTKXDMF3_HEADER(XdmfGridCollection.hpp)
#include VTKXDMF3_HEADER(XdmfGridCollectionType.hpp)
#include VTKXDMF3_HEADER(XdmfReader.hpp)
#include VTKXDMF3_HEADER(XdmfRectilinearGrid.hpp)
#include VTKXDMF3_HEADER(XdmfRegularGrid.hpp)
#include VTKXDMF3_HEADER(XdmfUnstructuredGrid.hpp)
#include <algorithm>
......
......@@ -29,11 +29,12 @@
#include "vtkStructuredGrid.h"
#include "vtkXdmf3DataSet.h"
#include "XdmfDomain.hpp"
#include "XdmfGridCollection.hpp"
#include "XdmfGridCollectionType.hpp"
#include "XdmfHeavyDataWriter.hpp"
#include "XdmfWriter.hpp"
#include "vtk_xdmf3.h"
#include VTKXDMF3_HEADER(XdmfDomain.hpp)
#include VTKXDMF3_HEADER(XdmfGridCollection.hpp)
#include VTKXDMF3_HEADER(XdmfGridCollectionType.hpp)
#include VTKXDMF3_HEADER(core/XdmfHeavyDataWriter.hpp)
#include VTKXDMF3_HEADER(core/XdmfWriter.hpp)
#include <stack>
#include <string>
......
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