COMP: Moving convex hull and layers filter to infovis due to rendering dep

Change-Id: If4bb8e030df38f7d1f8400ac053a213b45053f9b

Graphics/CMakeLists.txt

@@ -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

Graphics/Testing/Cxx/CMakeLists.txt

@@ -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

Infovis/CMakeLists.txt

@@ -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:

Infovis/Testing/Cxx/CMakeLists.txt

@@ -12,6 +12,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
     TestCirclePackLayoutStrategy
     TestCollapseVerticesByArray
     TestContingencyStatistics
+    TestConvexHull2D
     TestCorrelativeStatistics
     TestCosmicTreeLayoutStrategy
     TestDataObjectToTable

Graphics/vtkConvexHull2D.h → Infovis/vtkConvexHull2D.h

@@ -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();

Graphics/vtkGraphAnnotationLayersFilter.h → Infovis/vtkGraphAnnotationLayersFilter.h

@@ -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();