An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit a67bcd99 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

cmake: remove usage of the ABSTRACT property

Now that instantiators are gone, nothing cares about the ABSTRACT
property.
parent 2ad5045b
......@@ -80,7 +80,6 @@ endmacro()
# <module>_HEADERS_LOADED = True if the module header info has been loaded
# <module>_HEADERS = List of headers
# <module>_HEADER_<header>_EXISTS
# <module>_HEADER_<header>_ABSTRACT
# <module>_HEADER_<header>_WRAP_EXCLUDE
# <module>_HEADER_<header>_WRAP_EXCLUDE_PYTHON
macro(vtk_module_headers_load mod)
......
......@@ -5,6 +5,5 @@ foreach(header ${@vtk-module@_HEADERS})
set(@vtk-module@_HEADER_${header}_EXISTS 1)
endforeach()
@vtk-module-ABSTRACT@
@vtk-module-WRAP_EXCLUDE@
@vtk-module-WRAP_EXCLUDE_PYTHON@
......@@ -396,15 +396,9 @@ function(vtk_module_export sources)
get_source_file_property(_wrap_exclude ${src} WRAP_EXCLUDE)
get_source_file_property(_wrap_exclude_python ${src} WRAP_EXCLUDE_PYTHON)
get_source_file_property(_abstract ${src} ABSTRACT)
list(APPEND vtk-module-HEADERS ${_cls})
if(_abstract)
set(vtk-module-ABSTRACT
"${vtk-module-ABSTRACT}set(${vtk-module}_HEADER_${_cls}_ABSTRACT 1)\n")
endif()
if(_wrap_exclude)
set(vtk-module-WRAP_EXCLUDE
"${vtk-module-WRAP_EXCLUDE}set(${vtk-module}_HEADER_${_cls}_WRAP_EXCLUDE 1)\n")
......@@ -653,7 +647,6 @@ function(vtk_module_library name)
vtk_module_impl()
set(vtk-module-HEADERS)
set(vtk-module-ABSTRACT)
# Collect header files matching sources.
set(_hdrs ${${vtk-module}_HDRS})
......
......@@ -56,7 +56,6 @@ $<$<BOOL:$<TARGET_PROPERTY:${module_name},INCLUDE_DIRECTORIES>>:
# file properties to include in the hierarchy file
get_property(TMP_WRAP_EXCLUDE SOURCE ${FILE} PROPERTY WRAP_EXCLUDE)
get_source_file_property(TMP_ABSTRACT ${FILE} ABSTRACT)
get_source_file_property(TMP_EXCLUDE_PYTHON ${FILE} WRAP_EXCLUDE_PYTHON)
# what is the filename without the extension
......@@ -98,10 +97,6 @@ $<$<BOOL:$<TARGET_PROPERTY:${module_name},INCLUDE_DIRECTORIES>>:
set(VTK_WRAPPER_INIT_DATA
"${VTK_WRAPPER_INIT_DATA}${TMP_INPUT};${module_name}")
if(TMP_ABSTRACT)
set(VTK_WRAPPER_INIT_DATA "${VTK_WRAPPER_INIT_DATA};ABSTRACT")
endif()
if(TMP_WRAP_EXCLUDE)
set(VTK_WRAPPER_INIT_DATA "${VTK_WRAPPER_INIT_DATA};WRAP_EXCLUDE")
endif()
......
......@@ -45,15 +45,6 @@ set(Module_SRCS
vtkScatterPlotMatrix.cxx
)
set_source_files_properties(
vtkChart
vtkControlPointsItem
vtkPlot
vtkPlot3D
vtkScalarsToColorsItem
ABSTRACT
)
set_source_files_properties(
vtkContextPolygon
WRAP_EXCLUDE
......
......@@ -4,7 +4,6 @@ set(Module_SRCS
)
#set_source_files_properties(
# ABSTRACT
# WRAP_EXCLUDE
#)
......
......@@ -26,9 +26,4 @@ set(Module_SRCS
vtkParametricPluckerConoid.cxx
)
set_source_files_properties(
vtkParametricFunction
ABSTRACT
)
vtk_module_library(vtkCommonComputationalGeometry ${Module_SRCS})
......@@ -538,47 +538,6 @@ configure_file(
${CMAKE_CURRENT_BINARY_DIR}/vtkFloatingPointExceptionsConfigure.h
)
set_source_files_properties(
# vtkObjectBase is marked ABSTRACT so that instantiators are happy.
vtkAbstractArray
vtkArray
vtkArrayIterator
vtkCallbackCommand
vtkCommand
vtkCommonInformationKeyManager
vtkDataArray
vtkEventForwarderCommand
vtkFloatingPointExceptions
vtkFunctionSet
vtkGaussianRandomSequence
vtkInformationDataObjectKey
vtkInformationDoubleKey
vtkInformationDoubleVectorKey
vtkInformationIdTypeKey
vtkInformationInformationKey
vtkInformationInformationVectorKey
vtkInformationIntegerKey
vtkInformationIntegerPointerKey
vtkInformationIntegerVectorKey
vtkInformationKey
vtkInformationKeyVectorKey
vtkInformationObjectBaseKey
vtkInformationObjectBaseVectorKey
vtkInformationQuadratureSchemeDefinitionVectorKey
vtkInformationRequestKey
vtkInformationStringKey
vtkInformationStringVectorKey
vtkInformationUnsignedLongKey
vtkInformationVariantKey
vtkInformationVariantVectorKey
vtkObjectBase
vtkObjectFactory
vtkOldStyleCallbackCommand
vtkRandomSequence
vtkWindow
ABSTRACT
)
set_source_files_properties(
vtkAOSDataArrayTemplate.h
vtkAOSDataArrayTemplate.txx
......
......@@ -230,45 +230,6 @@ set(${vtk-module}_HDRS
vtkStaticCellLinksTemplate.h
)
set_source_files_properties(
vtkAbstractCellLinks
vtkAbstractCellLocator
vtkAbstractPointLocator
vtkCell
vtkCell3D
vtkCellIterator
vtkCompositeDataIterator
vtkCompositeDataSet
vtkDataObjectTree
vtkAbstractElectronicData
vtkDataSet
vtkDataSetGhostGenerator
vtkDistributedGraphHelper
vtkGenericAttribute
vtkGenericAdaptorCell
vtkGenericCellIterator
vtkGenericCellTessellator
vtkGenericDataSet
vtkGenericPointIterator
vtkGenericSubdivisionErrorMetric
vtkGraph
vtkHyperOctreeCursor
vtkHyperOctreePointsGrabber
vtkHyperTree
vtkHyperTreeCursor
vtkImplicitFunction
vtkIncrementalPointLocator
vtkInformationQuadratureSchemeDefinitionVectorKey
vtkLocator
vtkNonLinearCell
vtkPointSet
vtkSpline
vtkStructuredData
vtkTreeIterator
vtkUnstructuredGridBase
ABSTRACT
)
set_source_files_properties(
vtkAMRBox
vtkArrayListTemplate.txx
......
......@@ -64,20 +64,6 @@ SET(Module_SRCS
vtkNonOverlappingAMRAlgorithm.cxx
)
set_source_files_properties(
vtkExecutive
vtkHyperOctreeAlgorithm
vtkHyperTreeGridAlgorithm
vtkImageAlgorithm
vtkImageInPlaceFilter
vtkInformationExecutivePortKey
vtkInformationExecutivePortVectorKey
vtkScalarTree
vtkSimpleImageToImageFilter
vtkThreadedImageAlgorithm
ABSTRACT
)
set_source_files_properties(
vtkExecutionSchedulerManager
vtkFilteringInformationKeyManager
......
......@@ -31,10 +31,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
PROPERTIES COMPILE_FLAGS -O0)
endif()
set_source_files_properties(
vtkFunctionSet
vtkInitialValueProblemSolver
ABSTRACT
)
vtk_module_library(vtkCommonMath ${Module_SRCS})
......@@ -8,11 +8,6 @@ set(Module_SRCS
vtkTimerLog.cxx
)
set_source_files_properties(
vtkSocket
ABSTRACT
)
if(NOT HAVE_SOCKETS)
# Tell vtkSocket.cxx that there are no sockets on this platform.
set_source_files_properties(vtkSocket.cxx PROPERTIES
......
......@@ -17,12 +17,4 @@ set(Module_SRCS
vtkLandmarkTransform.cxx
)
set_source_files_properties(
vtkAbstractTransform
vtkHomogeneousTransform
vtkLinearTransform
vtkWarpTransform
ABSTRACT
)
vtk_module_library(vtkCommonTransforms ${Module_SRCS})
......@@ -18,11 +18,6 @@ set(Module_SRCS
vtkXYZMolReader2.cxx
)
set_source_files_properties(
vtkMoleculeToPolyDataFilter.cxx
ABSTRACT
)
set_source_files_properties(
vtkBlueObeliskData.cxx
vtkBlueObeliskDataInternal.h
......
......@@ -8,12 +8,6 @@ set(Module_SRCS
vtkParallelAMRUtilities.cxx
)
set_source_files_properties(
vtkAMRBaseReader
vtkAMRBaseParticlesReader
ABSTRACT
)
set_source_files_properties(
vtkAMRUtilities
WRAP_EXCLUDE
......
......@@ -90,12 +90,6 @@ set(Module_SRCS
vtkAppendCompositeDataLeaves.cxx
)
set_source_files_properties(
vtkEdgeSubdivisionCriterion
vtkStreamerBase
ABSTRACT
)
set_source_files_properties(
vtkContourHelper
WRAP_EXCLUDE
......
......@@ -29,9 +29,4 @@ set(Module_SRCS
vtkHierarchicalDataExtractLevel.cxx
)
set_source_files_properties(
vtkExtractSelectionBase
ABSTRACT
)
vtk_module_library(vtkFiltersExtraction ${Module_SRCS})
......@@ -20,13 +20,6 @@ set(Module_SRCS
vtkTemporalStreamTracer.cxx
)
set_source_files_properties(
vtkAbstractInterpolatedVelocityField
vtkCompositeInterpolatedVelocityField.cxx
vtkParticleTracerBase
ABSTRACT
)
set_source_files_properties(
vtkLagrangianParticle.cxx
WRAP_EXCLUDE
......
......@@ -119,13 +119,4 @@ set(Module_SRCS
vtkCellTreeLocator.cxx
)
set_source_files_properties(
vtkApproximatingSubdivisionFilter
vtkDicer
vtkGraphWeightFilter
vtkInterpolatingSubdivisionFilter
vtkSubdivisionFilter
ABSTRACT
)
vtk_module_library(vtkFiltersGeneral ${Module_SRCS})
......@@ -26,12 +26,6 @@ set(Module_SRCS
vtkUniformGridGhostDataGenerator.cxx
)
set_source_files_properties(
vtkAbstractGridConnectivity
vtkDataSetGhostGenerator
ABSTRACT
)
set_source_files_properties(
vtkStructuredAMRNeighbor
vtkStructuredNeighbor
......
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