Commit e24f8f36 authored by Chris Harris's avatar Chris Harris
Browse files

Update build sytem to include vtkMPIImageReader

Update CMakeLists.txt, export header and remove use of
VTK_USE_MPI

Change-Id: Ic58d09eb3eab5682fd94408bfc4597bb5911a781
parent 3c357e55
...@@ -3,6 +3,7 @@ include_directories(${MPI_INCLUDE_PATH}) ...@@ -3,6 +3,7 @@ include_directories(${MPI_INCLUDE_PATH})
set(Module_SRCS set(Module_SRCS
vtkPNrrdReader.cxx vtkPNrrdReader.cxx
vtkMPIImageReader.cxx
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx ${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx
) )
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include "vtkObjectFactory.h" #include "vtkObjectFactory.h"
#include "vtkToolkits.h" #include "vtkToolkits.h"
#ifdef VTK_USE_MPI
// Include the MPI headers and then determine if MPIIO is available. // Include the MPI headers and then determine if MPIIO is available.
#include "vtkMPI.h" #include "vtkMPI.h"
...@@ -41,8 +39,6 @@ ...@@ -41,8 +39,6 @@
# define VTK_USE_MPI_IO 1 # define VTK_USE_MPI_IO 1
#endif #endif
#endif // VTK_USE_MPI
// If VTK_USE_MPI_IO is set, that means we will read the data ourself using // If VTK_USE_MPI_IO is set, that means we will read the data ourself using
// MPIIO. Otherwise, just delegate everything to the superclass. // MPIIO. Otherwise, just delegate everything to the superclass.
......
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
#ifndef __vtkMPIImageReader_h #ifndef __vtkMPIImageReader_h
#define __vtkMPIImageReader_h #define __vtkMPIImageReader_h
#include "vtkIOParallelMPIModule.h" // For export macro #include "vtkIOMPIImageModule.h" // For export macro
#include "vtkImageReader.h" #include "vtkImageReader.h"
class vtkMPIOpaqueFileHandle; class vtkMPIOpaqueFileHandle;
class vtkMultiProcessController; class vtkMultiProcessController;
class VTKIOPARALLELMPI_EXPORT vtkMPIImageReader : public vtkImageReader class VTKIOMPIIMAGE_EXPORT vtkMPIImageReader : public vtkImageReader
{ {
public: public:
vtkTypeMacro(vtkMPIImageReader, vtkImageReader); vtkTypeMacro(vtkMPIImageReader, vtkImageReader);
......
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