Commit 6d6ca4af authored by Jeff Baumes's avatar Jeff Baumes Committed by Kitware Robot
Browse files

Merge topic 'tulip-reader-enhancements'

346ce493 COMP: Moving convex hull and layers filter to infovis due to rendering dep
parents 75e300af 346ce493
......@@ -50,7 +50,6 @@ vtkConnectivityFilter.cxx
vtkContourFilter.cxx
vtkContourGrid.cxx
vtkConvertSelection.cxx
vtkConvexHull2D.cxx
vtkCubeSource.cxx
vtkCursor2D.cxx
vtkCursor3D.cxx
......@@ -114,7 +113,6 @@ vtkGlyph2D.cxx
vtkGlyph3D.cxx
vtkGlyphSource2D.cxx
vtkGradientFilter.cxx
vtkGraphAnnotationLayersFilter.cxx
vtkGraphGeodesicPath.cxx
vtkGraphLayoutFilter.cxx
vtkGraphToPoints.cxx
......
......@@ -19,7 +19,6 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
TestDensifyPolyData.cxx
TestClipHyperOctree.cxx
TestConvertSelection.cxx
TestConvexHull2D.cxx
TestDelaunay2D.cxx
TestExtraction.cxx
TestExtractSelection.cxx
......
......@@ -126,6 +126,14 @@ vtkXGMLReader.cxx
vtkXMLTreeReader.cxx
)
IF(VTK_USE_RENDERING)
SET(Kit_SRCS
${Kit_SRCS}
vtkConvexHull2D.cxx
vtkGraphAnnotationLayersFilter.cxx
)
ENDIF(VTK_USE_RENDERING)
# Add these classes only if using Boost
# About the BOOST_OLD_VERSION warning:
......
......@@ -12,6 +12,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
TestCirclePackLayoutStrategy
TestCollapseVerticesByArray
TestContingencyStatistics
TestConvexHull2D
TestCorrelativeStatistics
TestCosmicTreeLayoutStrategy
TestDataObjectToTable
......
......@@ -56,7 +56,7 @@ class vtkRenderer;
class vtkTransform;
class vtkTransformPolyDataFilter;
class VTK_GRAPHICS_EXPORT vtkConvexHull2D: public vtkPolyDataAlgorithm
class VTK_INFOVIS_EXPORT vtkConvexHull2D: public vtkPolyDataAlgorithm
{
public:
static vtkConvexHull2D *New();
......
......@@ -54,7 +54,7 @@ class vtkConvexHull2D;
class vtkRenderer;
class VTK_GRAPHICS_EXPORT vtkGraphAnnotationLayersFilter: public vtkPolyDataAlgorithm
class VTK_INFOVIS_EXPORT vtkGraphAnnotationLayersFilter: public vtkPolyDataAlgorithm
{
public:
static vtkGraphAnnotationLayersFilter *New();
......
Supports Markdown
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