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

wrapping: remove the WRAP_EXCLUDE property

Now that Tcl wrapping is gone, all wrapping tools now use
`WRAP_EXCLUDE_PYTHON` instead.
parent 71f173ad
......@@ -121,7 +121,6 @@ set_source_files_properties(
vtkmlib/ImplicitFunctionConverter
PROPERTIES
SKIP_HEADER_INSTALL 1
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
)
......@@ -135,7 +134,6 @@ set_source_files_properties(
vtkmCellSetSingleType
vtkmConnectivityExec
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
)
......
......@@ -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>_WRAP_EXCLUDE
# <module>_HEADER_<header>_WRAP_EXCLUDE_PYTHON
macro(vtk_module_headers_load mod)
if(NOT ${mod}_HEADERS_LOADED)
......
......@@ -5,5 +5,4 @@ foreach(header ${@vtk-module@_HEADERS})
set(@vtk-module@_HEADER_${header}_EXISTS 1)
endforeach()
@vtk-module-WRAP_EXCLUDE@
@vtk-module-WRAP_EXCLUDE_PYTHON@
......@@ -384,16 +384,10 @@ function(vtk_module_export sources)
get_filename_component(_filename "${hdr}" NAME)
string(REGEX REPLACE "\\.h$" "" _cls "${_filename}")
get_source_file_property(_wrap_exclude ${src} WRAP_EXCLUDE)
get_source_file_property(_wrap_exclude_python ${src} WRAP_EXCLUDE_PYTHON)
list(APPEND vtk-module-HEADERS ${_cls})
if(_wrap_exclude)
set(vtk-module-WRAP_EXCLUDE
"${vtk-module-WRAP_EXCLUDE}set(${vtk-module}_HEADER_${_cls}_WRAP_EXCLUDE 1)\n")
endif()
if(_wrap_exclude_python)
set(vtk-module-WRAP_EXCLUDE_PYTHON
"${vtk-module-WRAP_EXCLUDE_PYTHON}set(${vtk-module}_HEADER_${_cls}_WRAP_EXCLUDE_PYTHON 1)\n")
......
......@@ -55,7 +55,6 @@ $<$<BOOL:$<TARGET_PROPERTY:${module_name},INCLUDE_DIRECTORIES>>:
foreach(FILE ${SOURCES})
# file properties to include in the hierarchy file
get_property(TMP_WRAP_EXCLUDE SOURCE ${FILE} PROPERTY WRAP_EXCLUDE)
get_source_file_property(TMP_EXCLUDE_PYTHON ${FILE} WRAP_EXCLUDE_PYTHON)
# what is the filename without the extension
......@@ -78,7 +77,7 @@ $<$<BOOL:$<TARGET_PROPERTY:${module_name},INCLUDE_DIRECTORIES>>:
endif()
# ensure that header exists (assume it exists if it is marked as wrapped)
if(TMP_WRAP_EXCLUDE)
if(TMP_EXCLUDE_PYTHON)
if(NOT EXISTS ${TMP_INPUT})
set(TMP_EXCLUDE_FROM_HIERARCHY ON)
endif()
......@@ -97,10 +96,6 @@ $<$<BOOL:$<TARGET_PROPERTY:${module_name},INCLUDE_DIRECTORIES>>:
set(VTK_WRAPPER_INIT_DATA
"${VTK_WRAPPER_INIT_DATA}${TMP_INPUT};${module_name}")
if(TMP_WRAP_EXCLUDE)
set(VTK_WRAPPER_INIT_DATA "${VTK_WRAPPER_INIT_DATA};WRAP_EXCLUDE")
endif()
if(TMP_EXCLUDE_PYTHON)
set(VTK_WRAPPER_INIT_DATA "${VTK_WRAPPER_INIT_DATA};WRAP_EXCLUDE_PYTHON")
endif()
......
......@@ -45,9 +45,4 @@ set(Module_SRCS
vtkScatterPlotMatrix.cxx
)
set_source_files_properties(
vtkContextPolygon
WRAP_EXCLUDE
)
vtk_module_library(vtkChartsCore ${Module_SRCS})
......@@ -3,8 +3,4 @@ set(Module_SRCS
vtkNamedColors.cxx
)
#set_source_files_properties(
# WRAP_EXCLUDE
#)
vtk_module_library(vtkCommonColor ${Module_SRCS})
......@@ -352,7 +352,6 @@ if(WIN32)
vtkWin32OutputWindowProcessEncoded.c
vtkWin32ProcessOutputWindow.cxx
)
set_property(SOURCE vtkWin32OutputWindowProcessEncoded.c PROPERTY WRAP_EXCLUDE 1)
endif()
if(ANDROID)
......@@ -538,95 +537,6 @@ configure_file(
${CMAKE_CURRENT_BINARY_DIR}/vtkFloatingPointExceptionsConfigure.h
)
set_source_files_properties(
vtkAOSDataArrayTemplate.h
vtkAOSDataArrayTemplate.txx
vtkArrayCoordinates.cxx
vtkArrayExtents.cxx
vtkArrayExtentsList.cxx
vtkArrayIteratorTemplate.txx
vtkArrayIteratorTemplateInstantiate.cxx
vtkArrayRange.cxx
vtkArraySort.cxx
vtkArrayWeights.cxx
vtkBuffer.h
vtkBoundingBox.cxx
vtkBreakPoint.cxx
vtkCallbackCommand.cxx
vtkCommonInformationKeyManager.cxx
vtkDebugLeaksManager.cxx
vtkEventForwarderCommand.cxx
vtkFloatingPointExceptions
vtkGarbageCollectorManager.cxx
vtkIndent.cxx
vtkLargeInteger.cxx
vtkMersenneTwister_Private.cxx
vtkOStrStreamWrapper.cxx
vtkOStreamWrapper.cxx
vtkOldStyleCallbackCommand.cxx
vtkSimpleCriticalSection.cxx
vtkSmartPointerBase.cxx
vtkSOADataArrayTemplate.txx
vtkSOADataArrayTemplateInstantiate.cxx # Has no API
vtkStdString.cxx
vtkTimeStamp.cxx
vtkVariant.cxx
vtkWeakPointerBase.cxx
vtkUnicodeString.cxx
vtkDataArrayPrivate.txx
vtkABI.h
vtkAngularPeriodicDataArray.txx
vtkArrayInterpolate.h
vtkArrayInterpolate.txx
vtkArrayIteratorIncludes.h
vtkArrayIteratorTemplate.h
vtkArrayIteratorTemplateImplicit.txx
vtkArrayPrint.h
vtkArrayPrint.txx
vtkAtomicTypeConcepts.h
vtkAtomicTypes.h
vtkAutoInit.h
vtkDenseArray.txx
vtkGenericDataArray.txx
vtkGenericDataArrayHelpers.h
vtkInformationInternals.h
vtkIOStream.h
vtkIOStreamFwd.h
vtkIOStreamFwd.h
vtkMathUtilities.h
vtkMappedDataArray.txx
vtkNew.h
vtkPeriodicDataArray.txx
vtkSetGet.h
vtkSmartPointer.h
vtkSparseArray.txx
vtkTemplateAliasMacro.h
vtkTypeTraits.h
vtkTypedArray.txx
vtkTypedDataArray.txx
vtkVariantCast.h
vtkVariantCreate.h
vtkVariantExtract.h
vtkVariantInlineOperators.h
vtkWeakPointer.h
vtkWin32Header.h
vtkWindows.h
vtkToolkits.h
vtkSystemIncludes.h
vtkType.h
vtkConfigure.h
vtkMathConfigure.h
vtkVersionMacros.h
vtkWrappingHints.h
${VTK_SMP_SOURCES}
${VTK_SMP_HEADERS}
"${VTK_TYPELISTMACROS_HEADER}"
WRAP_EXCLUDE
)
# python uses WRAP_EXCLUDE_PYTHON and ignores WRAP_EXCLUDE
set_source_files_properties(
vtkABI.h
vtkAOSDataArrayTemplate.txx
......
......@@ -235,42 +235,9 @@ set(${vtk-module}_HDRS
vtkStaticCellLinksTemplate.h
)
set_source_files_properties(
vtkAMRBox
vtkArrayListTemplate.txx
vtkAtom
vtkBond
vtkBoundingBox
vtkCellType
vtkDataArrayDispatcher
vtkDispatcher_Private
vtkDispatcher
vtkDoubleDispatcher
vtkMappedUnstructuredGrid.txx
vtkMappedUnstructuredGridCellIterator.txx
vtkMarchingSquaresLineCases
vtkMarchingCubesTriangleCases
vtkImageIterator
vtkImageProgressIterator
vtkPixelExtent.cxx
vtkPixelTransfer.cxx
vtkStaticCellLinksTemplate.txx
vtkVector
vtkColor
vtkRect
vtkVectorOperators
vtkAMRDataInternals
WRAP_EXCLUDE
)
set_source_files_properties(
vtkDispatcher_Private
PROPERTIES WRAP_EXCLUDE_PYTHON 1
)
set_source_files_properties(
vtkLagrangeInterpolation.cxx
PROPERTIES WRAP_EXCLUDE 1
)
vtk_module_library(vtkCommonDataModel ${Module_SRCS})
......@@ -70,12 +70,4 @@ if (NOT VTK_LEGACY_REMOVE)
)
endif()
set_source_files_properties(
vtkExecutionSchedulerManager
vtkFilteringInformationKeyManager
vtkImageProgressIterator
vtkSMPProgressObserver
WRAP_EXCLUDE
)
vtk_module_library(vtkCommonExecutionModel ${Module_SRCS})
......@@ -15,12 +15,6 @@ set(Module_SRCS
vtkTuple.h
)
set_source_files_properties(
vtkQuaternion
vtkTuple
WRAP_EXCLUDE
)
set(
${vtk-module}_HDRS
vtkQuaternion.txx
......
......@@ -7,10 +7,4 @@ set(Module_SRCS
vtkResourceFileLocator.cxx
)
set_source_files_properties(
vtkErrorCode.cxx
vtkPolygonBuilder.cxx
WRAP_EXCLUDE
)
vtk_module_library(vtkCommonMisc ${Module_SRCS})
......@@ -18,14 +18,6 @@ set(Module_SRCS
vtkXYZMolReader2.cxx
)
set_source_files_properties(
vtkBlueObeliskData.cxx
vtkBlueObeliskDataInternal.h
vtkBlueObeliskDataParser.cxx
PROPERTIES
WRAP_EXCLUDE 1
)
set_source_files_properties(
vtkBlueObeliskDataInternal.h
PROPERTIES
......
......@@ -19,7 +19,6 @@ list(APPEND Module_SRCS
set_source_files_properties(
${vtk-module}ObjectFactory.cxx
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
)
......
......@@ -8,9 +8,4 @@ set(Module_SRCS
vtkParallelAMRUtilities.cxx
)
set_source_files_properties(
vtkAMRUtilities
WRAP_EXCLUDE
)
vtk_module_library(vtkFiltersAMR ${Module_SRCS})
......@@ -90,9 +90,4 @@ set(Module_SRCS
vtkAppendCompositeDataLeaves.cxx
)
set_source_files_properties(
vtkContourHelper
WRAP_EXCLUDE
)
vtk_module_library(vtkFiltersCore ${Module_SRCS})
......@@ -20,9 +20,4 @@ set(Module_SRCS
vtkTemporalStreamTracer.cxx
)
set_source_files_properties(
vtkLagrangianParticle.cxx
WRAP_EXCLUDE
)
vtk_module_library(vtkFiltersFlowPaths ${Module_SRCS})
......@@ -26,10 +26,4 @@ set(Module_SRCS
vtkUniformGridGhostDataGenerator.cxx
)
set_source_files_properties(
vtkStructuredAMRNeighbor
vtkStructuredNeighbor
WRAP_EXCLUDE
)
vtk_module_library(vtkFiltersGeometry ${Module_SRCS})
......@@ -12,8 +12,6 @@ set(Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx
vtkOTUtilities.cxx)
set_source_files_properties(vtkOTUtilities WRAP_EXCLUDE)
include(vtkObjectFactory)
vtk_add_override(vtkScatterPlotMatrix vtkOTScatterPlotMatrix)
vtk_object_factory_configure("${vtk_module_overrides}")
......
......@@ -49,7 +49,6 @@ set_source_files_properties(
${vtk-module}ObjectFactory.cxx
vtkPOutlineFilterInternals.cxx
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
)
......
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