Commit ce190e66 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Ben Boeckel
Browse files

vtkFiltersParallelDIY2: update to the new module system

parent dade1141
if (NOT WIN32)
include(vtkMPI)
include(vtkObjectFactory)
vtk_object_factory_declare(
BASE vtkAggregateDataSetFilter
OVERRIDE vtkDIYAggregateDataSetFilter)
vtk_object_factory_declare(
BASE vtkResampleToImage
OVERRIDE vtkPResampleToImage)
vtk_object_factory_declare(
BASE vtkResampleWithDataSet
OVERRIDE vtkPResampleWithDataSet)
set(Module_SRCS
vtkDIYAggregateDataSetFilter.cxx
vtkPResampleToImage.cxx
vtkPResampleWithDataSet.cxx
)
vtk_object_factory_configure(
SOURCE_FILE vtk_object_factory_source
HEADER_FILE vtk_object_factory_header
EXPORT_MACRO "VTKFILTERSPARALLELDIY2_EXPORT")
vtk_add_override(vtkResampleToImage vtkPResampleToImage)
vtk_add_override(vtkResampleWithDataSet vtkPResampleWithDataSet)
vtk_add_override(vtkAggregateDataSetFilter vtkDIYAggregateDataSetFilter)
set(classes
vtkDIYAggregateDataSetFilter
vtkPResampleToImage
vtkPResampleWithDataSet)
vtk_object_factory_configure("${vtk_module_overrides}")
list(APPEND Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
vtk_module_add_module(VTK::FiltersParallelDIY2
CLASSES ${classes}
SOURCES ${vtk_object_factory_source}
PRIVATE_HEADERS ${vtk_object_factory_header})
add_definitions(-DDIY_NO_THREADS)
vtk_module_library(vtkFiltersParallelDIY2 ${Module_SRCS})
vtk_mpi_link(vtkFiltersParallelDIY2)
endif()
vtk_module_definitions(VTK::FiltersParallelDIY2
PRIVATE DIY_NO_THREADS)
include(vtkMPI)
set (vtkFiltersParallelDIY2CxxTests-MPI_NUMPROCS 2)
vtk_add_test_mpi(vtkFiltersParallelDIY2CxxTests-MPI tests
TESTING_DATA
......@@ -21,4 +19,4 @@ set(all_tests
${no_data_tests_4_procs}
)
vtk_test_mpi_executable(vtkFiltersParallelDIY2CxxTests-MPI all_tests)
vtk_test_cxx_executable(vtkFiltersParallelDIY2CxxTests-MPI all_tests)
if (NOT WIN32)
vtk_module(vtkFiltersParallelDIY2
IMPLEMENTS
vtkFiltersCore
vtkFiltersParallel
GROUPS
MPI
TEST_DEPENDS
vtkFiltersParallelMPI
vtkInteractionStyle
vtkRenderingOpenGL2
vtkRenderingParallel
vtkTestingCore
vtkTestingRendering
KIT
vtkParallel
DEPENDS
vtkFiltersCore
vtkFiltersParallel
vtkImagingCore
vtkdiy2
PRIVATE_DEPENDS
vtkCommonCore
vtkCommonDataModel
vtkCommonExecutionModel
vtkIOXML
vtkParallelMPI
)
endif()
NAME
VTK::FiltersParallelDIY2
LIBRARY_NAME
vtkFiltersParallelDIY2
CONDITION
NOT WIN32
KIT
VTK::Parallel
GROUPS
MPI
IMPLEMENTS
VTK::FiltersCore
VTK::FiltersParallel
DEPENDS
VTK::FiltersCore
VTK::FiltersParallel
PRIVATE_DEPENDS
VTK::CommonCore
VTK::CommonDataModel
VTK::CommonExecutionModel
VTK::IOXML
VTK::ImagingCore
VTK::ParallelMPI
VTK::diy2
TEST_DEPENDS
VTK::FiltersGeometry
VTK::FiltersParallelMPI
VTK::InteractionStyle
VTK::ParallelMPI
VTK::RenderingOpenGL2
VTK::RenderingParallel
VTK::TestingCore
VTK::TestingRendering
VTK::diy2
VTK::mpi
......@@ -46,15 +46,13 @@
#include <set>
#include "vtk_diy2.h" // must include this before any diy header
VTKDIY2_PRE_INCLUDE
#include VTK_DIY2_HEADER(diy/assigner.hpp)
#include VTK_DIY2_HEADER(diy/link.hpp)
#include VTK_DIY2_HEADER(diy/master.hpp)
#include VTK_DIY2_HEADER(diy/mpi.hpp)
#include VTK_DIY2_HEADER(diy/reduce.hpp)
#include VTK_DIY2_HEADER(diy/partners/swap.hpp)
#include VTK_DIY2_HEADER(diy/decomposition.hpp)
VTKDIY2_POST_INCLUDE
#include VTK_DIY2(diy/assigner.hpp)
#include VTK_DIY2(diy/link.hpp)
#include VTK_DIY2(diy/master.hpp)
#include VTK_DIY2(diy/mpi.hpp)
#include VTK_DIY2(diy/reduce.hpp)
#include VTK_DIY2(diy/partners/swap.hpp)
#include VTK_DIY2(diy/decomposition.hpp)
vtkStandardNewMacro(vtkDIYAggregateDataSetFilter);
......
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