merges from the main tree and some exclusions

Hybrid/CMakeLists.txt

@@ -44,12 +44,6 @@ vtkPointWidget.cxx
 vtkPolyDataSourceWidget.cxx
 vtkPolyDataToImageStencil.cxx
 vtkProcrustesAlignmentFilter.cxx
-vtkPushImageFilterSample.cxx
-vtkPushImageReader.cxx
-vtkPushPipeline.cxx
-vtkRIBExporter.cxx
-vtkRIBLight.cxx
-vtkRIBProperty.cxx
 vtkRenderLargeImage.cxx
 vtkScalarBarWidget.cxx
 vtkSphereWidget.cxx

Patented/CMakeLists.txt

@@ -10,18 +10,10 @@ SET(KIT_JAVA_LIBS vtkGraphicsJava vtkImagingJava)
 SET(KIT_LIBS vtkGraphics vtkImaging vtkIO)
 
 SET( Kit_SRCS
-vtkDecimate.cxx
-vtkDividingCubes.cxx
 vtkGridSynchronizedTemplates3D.cxx
-vtkImageMarchingCubes.cxx
 vtkKitwareContourFilter.cxx
 vtkKitwareCutter.cxx
-vtkMarchingContourFilter.cxx
-vtkMarchingCubes.cxx
-vtkMarchingSquares.cxx
 vtkRectilinearSynchronizedTemplates.cxx
-vtkSliceCubes.cxx
-vtkSweptSurface.cxx
 vtkSynchronizedTemplates2D.cxx
 vtkSynchronizedTemplates3D.cxx
 )

Rendering/CMakeLists.txt

@@ -38,7 +38,6 @@ vtkFollower.cxx
 vtkFrustumCoverageCuller.cxx
 vtkGenericRenderWindowInteractor.cxx
 vtkGraphicsFactory.cxx
-vtkIVExporter.cxx
 vtkImageActor.cxx
 vtkImageMapper.cxx
 vtkImageViewer.cxx
@@ -68,8 +67,6 @@ vtkLightCollection.cxx
 vtkLightKit.cxx
 vtkMapper.cxx
 vtkMapperCollection.cxx
-vtkOBJExporter.cxx
-vtkOOGLExporter.cxx
 vtkParallelCoordinatesActor.cxx
 vtkPicker.cxx
 vtkPointPicker.cxx
@@ -99,7 +96,6 @@ vtkUnstructuredGridBunykRayCastFunction.cxx
 vtkUnstructuredGridVolumeMapper.cxx
 vtkUnstructuredGridVolumeRayCastFunction.cxx
 vtkUnstructuredGridVolumeRayCastMapper.cxx
-vtkVRMLExporter.cxx
 vtkVolume.cxx
 vtkVolumeCollection.cxx
 vtkVolumeMapper.cxx
@@ -123,12 +119,6 @@ IF (VTK_HAVE_VP1000)
     )
 ENDIF (VTK_HAVE_VP1000)
 
-IF(VTK_USE_GL2PS)
-  SET(Kit_SRCS ${Kit_SRCS} vtkGL2PSExporter.cxx)
-  SET(Kit_GL2PS_SRCS ${VTK_SOURCE_DIR}/Utilities/gl2ps/gl2ps.c)
-  ADD_DEFINITIONS(-DGL2PS_HAVE_ZLIB)
-ENDIF(VTK_USE_GL2PS)
-
 SET( KitOpenGL_SRCS
   vtkOpenGLActor.cxx
   vtkOpenGLCamera.cxx