Commit 604fa6c1 authored by Dan Lipsa's avatar Dan Lipsa Committed by Kitware Robot

Merge topic 'module-split-cinema-exporter'

713f065e Move CinemaExporter in its own module.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Acked-by: David E. DeMarle's avatarDavid E. DeMarle <dave.demarle@kitware.com>
Merge-request: !3191
parents 7c95fa72 713f065e
Pipeline #134486 running with stage
......@@ -331,11 +331,13 @@ if (PARAVIEW_ENABLE_PYTHON AND (NOT PARAVIEW_PYTHON_VERSION STREQUAL "3"))
# paraview/paraview#17353
list(APPEND paraview_requested_modules
ParaView::CinemaPython
ParaView::CinemaReader)
ParaView::CinemaReader
ParaView::VTKExtensionsCinemaExporter)
else ()
list(APPEND paraview_rejected_modules
ParaView::CinemaPython
ParaView::CinemaReader)
ParaView::CinemaReader
ParaView::VTKExtensionsCinemaExporter)
endif()
if (PARAVIEW_ENABLE_PYTHON AND PARAVIEW_BUILD_TESTING)
......
set(classes
vtkCinemaExporter)
vtk_module_add_module(ParaView::VTKExtensionsCinemaExporter
CLASSES ${classes})
NAME
ParaView::VTKExtensionsCinemaExporter
LIBRARY_NAME
vtkPVVTKExtensionsCinemaExporter
CONDITION
PARAVIEW_ENABLE_PYTHON
KIT
ParaView::CoreKit
DEPENDS
VTK::IOExport
PRIVATE_DEPENDS
VTK::CommonCore
VTK::PythonInterpreter
......@@ -27,9 +27,9 @@
#define vtkCinemaExporter_h
#include "vtkExporter.h"
#include "vtkPVVTKExtensionsRenderingModule.h" // needed for export macro
#include "vtkPVVTKExtensionsCinemaExporterModule.h" // needed for export macro
class VTKPVVTKEXTENSIONSRENDERING_EXPORT vtkCinemaExporter : public vtkExporter
class VTKPVVTKEXTENSIONSCINEMAEXPORTER_EXPORT vtkCinemaExporter : public vtkExporter
{
public:
static vtkCinemaExporter* New();
......
......@@ -90,13 +90,6 @@ set(classes
vtkVolumeRepresentationPreprocessor
vtkZlibImageCompressor)
if (TARGET VTK::PythonInterpreter)
# TODO: Split these into a separate module so that there isn't a public
# optional dependency.
list(APPEND classes
vtkCinemaExporter)
endif ()
if (TARGET VTK::ParallelMPI)
# TODO: Split these into a separate module so that there isn't a public
# optional dependency.
......
......@@ -38,13 +38,11 @@ OPTIONAL_DEPENDS
ParaView::icet
ParaView::nvpipe
VTK::FiltersParallelMPI
VTK::RenderingMatplotlib
VTK::RenderingOSPRay
# These affect the public API.
ParaView::icet
VTK::ParallelMPI
VTK::PythonInterpreter
TEST_DEPENDS
VTK::IOAMR
VTK::IOXML
......
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