Commit ee00144d authored by George Zagaris's avatar George Zagaris Committed by Marcus D. Hanwell
Browse files

ENH: Moving code from Common to Filtering

Moving the connectivity classes etc. to Filtering to avoid circular
dependency between Common and Filtering kits.

Change-Id: I3daedc7c7f83c2f08cf34da9547cf985ee48acb1
parent fbe6d534
......@@ -19,7 +19,6 @@ ENDIF (UNIX)
SET( Kit_SRCS
vtkAbstractArray.cxx
vtkAbstractGridConnectivity.cxx
vtkAbstractTransform.cxx
vtkAmoebaMinimizer.cxx
vtkAnimationCue.cxx
......@@ -180,8 +179,6 @@ vtkStdString.cxx
vtkStringArray.cxx
vtkStructuredData.cxx
vtkStructuredExtent.cxx
vtkStructuredGridConnectivity.cxx
vtkStructuredNeighbor.cxx
vtkStructuredVisibilityConstraint.cxx
vtkTableExtentTranslator.cxx
vtkTensor.cxx
......@@ -352,7 +349,6 @@ SET(Kit_WRAP_HEADERS
SET_SOURCE_FILES_PROPERTIES(
# vtkObjectBase is marked ABSTRACT so that instantiators are happy.
vtkAbstractArray
vtkAbstractGridConnectivity
vtkArrayIterator
vtkArrayIteratorTemplate
vtkAbstractTransform
......@@ -433,7 +429,6 @@ SET_SOURCE_FILES_PROPERTIES(
vtkRect.h
vtkSmartPointerBase.cxx
vtkStdString.cxx
vtkStructuredNeighbor.cxx
vtkTimeStamp.cxx
vtkVariant.cxx
vtkWeakPointerBase.cxx
......
......@@ -87,7 +87,6 @@ IF(PYTHON_EXECUTABLE)
vtkSparseArray.h
vtkStdString.h
vtkStructuredData.h
vtkStructuredNeighbor.h
vtkSystemIncludes.h
vtkTcl.h
vtkTclUtil.h
......
......@@ -37,9 +37,6 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
EXTRA_INCLUDE vtkTestDriver.h
)
ADD_EXECUTABLE(TestStructuredGridConnectivity TestStructuredGridConnectivity.cxx)
TARGET_LINK_LIBRARIES(TestStructuredGridConnectivity vtkCommon vtkFiltering vtkIO)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests} vtkTestNewVar.cxx)
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkCommon)
......
......@@ -8,6 +8,7 @@ SET(KIT_INTERFACE_LIBRARIES vtkCommon)
SET( Kit_SRCS
vtkImageToStructuredGrid.cxx
vtkAbstractCellLocator.cxx
vtkAbstractGridConnectivity.cxx
vtkAbstractImageInterpolator.cxx
vtkAbstractInterpolatedVelocityField.cxx
vtkAbstractMapper.cxx
......@@ -205,7 +206,12 @@ vtkSphere.cxx
vtkSpline.cxx
vtkStreamingDemandDrivenPipeline.cxx
vtkStructuredGridAlgorithm.cxx
vtkStructuredGridConnectivity.cxx
vtkStructuredGrid.cxx
vtkStructuredGridSource.cxx
vtkStructuredGridToPolyDataFilter.cxx
vtkStructuredGridToStructuredGridFilter.cxx
vtkStructuredNeighbor.cxx
vtkStructuredPointsCollection.cxx
vtkStructuredPoints.cxx
vtkSuperquadric.cxx
......@@ -245,6 +251,7 @@ vtkWedge.cxx
SET_SOURCE_FILES_PROPERTIES(
vtkAbstractCellLocator
vtkAbstractGridConnectivity
vtkAbstractImageInterpolator
vtkAbstractInterpolatedVelocityField
vtkAbstractMapper
......@@ -303,6 +310,7 @@ SET_SOURCE_FILES_PROPERTIES(
vtkImageProgressIterator.cxx
vtkMarchingSquaresLineCases.cxx
vtkMarchingCubesTriangleCases.cxx
vtkStructuredNeighbor.cxx
WRAP_EXCLUDE
)
......
......@@ -38,5 +38,6 @@ IF(PYTHON_EXECUTABLE)
vtkMarchingSquaresCases.h
vtkMarchingSquaresLineCases.h
vtkStructuredPoints.h
vtkStructuredNeighbor.h
)
ENDIF(PYTHON_EXECUTABLE)
......@@ -51,6 +51,9 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
EXTRA_INCLUDE vtkTestDriver.h
)
ADD_EXECUTABLE(TestStructuredGridConnectivity TestStructuredGridConnectivity.cxx)
TARGET_LINK_LIBRARIES(TestStructuredGridConnectivity vtkCommon vtkFiltering vtkIO)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkIO vtkFiltering vtkGraphics ${EXTRALIBS})
......
......@@ -39,7 +39,7 @@ class vtkPointData;
class vtkCellData;
class vtkUnsignedCharArray;
class VTK_COMMON_EXPORT vtkAbstractGridConnectivity : public vtkObject
class VTK_FILTERING_EXPORT vtkAbstractGridConnectivity : public vtkObject
{
public:
vtkTypeMacro( vtkAbstractGridConnectivity, vtkObject );
......
......@@ -39,7 +39,7 @@
class vtkIdList;
class vtkUnsignedCharArray;
class VTK_COMMON_EXPORT vtkStructuredGridConnectivity :
class VTK_FILTERING_EXPORT vtkStructuredGridConnectivity :
public vtkAbstractGridConnectivity
{
public:
......
......@@ -22,7 +22,7 @@
#include "vtkObject.h"
class VTK_COMMON_EXPORT vtkStructuredNeighbor
class VTK_FILTERING_EXPORT vtkStructuredNeighbor
{
public:
// Class Member Variables made public for easier access
......
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