Commit 8eed21d0 authored by Kenneth Moreland's avatar Kenneth Moreland
Browse files

Do not declare headers for virtual classes that are removed

parent cb3bb43f
Pipeline #226345 passed with stage
......@@ -124,8 +124,19 @@ function(do_verify root_dir prefix)
cont/PointLocator.h
cont/StorageVirtual.h
cont/StorageVirtual.hxx
cont/VirtualObjectHandle.h
cont/cuda/internal/VirtualObjectTransferCuda.h
cont/internal/TransferInfo.h
cont/internal/VirtualObjectTransfer.h
cont/internal/VirtualObjectTransferInstantiate.h
cont/internal/VirtualObjectTransferShareWithControl.h
cont/kokkos/internal/VirtualObjectTransferKokkos.h
cont/openmp/internal/VirtualObjectTransferOpenMP.h
cont/serial/internal/VirtualObjectTransferSerial.h
cont/tbb/internal/VirtualObjectTransferTBB.h
exec/CellLocator.h
exec/PointLocator.h
internal/ArrayPortalVirtual.h
)
#by default every header in a testing directory doesn't need to be installed
......
......@@ -121,7 +121,6 @@ set(headers
UncertainArrayHandle.h
UnknownArrayHandle.h
VariantArrayHandle.h
VirtualObjectHandle.h
)
set(template_sources
......@@ -194,6 +193,7 @@ if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
CellLocator.h
PointLocator.h
StorageVirtual.h
VirtualObjectHandle.h
)
set(template_sources ${template_sources}
......
......@@ -18,9 +18,14 @@ set(headers
MakeThrustIterator.h
ScopedCudaStackSize.h
ThrustExceptionHandler.h
VirtualObjectTransferCuda.h
)
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
set(headers ${headers}
VirtualObjectTransferCuda.h
)
endif()
vtkm_declare_headers(${headers})
......
......@@ -33,13 +33,18 @@ set(headers
ReverseConnectivityBuilder.h
StorageDeprecated.h
StorageError.h
TransferInfo.h
Variant.h
VirtualObjectTransfer.h
VirtualObjectTransferInstantiate.h
VirtualObjectTransferShareWithControl.h
)
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
set(headers ${headers}
TransferInfo.h
VirtualObjectTransfer.h
VirtualObjectTransferInstantiate.h
VirtualObjectTransferShareWithControl.h
)
endif()
vtkm_declare_headers(${headers})
# These source files are actually compiled in the parent directory.
......
......@@ -16,7 +16,13 @@ set(headers
Initialize.h
KokkosAlloc.h
KokkosTypes.h
VirtualObjectTransferKokkos.h)
)
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
set(headers ${headers}
VirtualObjectTransferKokkos.h
)
endif()
vtkm_declare_headers(${headers})
......
......@@ -18,9 +18,14 @@ set(headers
ParallelRadixSortOpenMP.h
ParallelScanOpenMP.h
ParallelSortOpenMP.h
VirtualObjectTransferOpenMP.h
)
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
set(headers ${headers}
VirtualObjectTransferOpenMP.h
)
endif()
vtkm_declare_headers(${headers})
#These sources need to always be built
......
......@@ -13,8 +13,14 @@ set(headers
DeviceAdapterMemoryManagerSerial.h
DeviceAdapterRuntimeDetectorSerial.h
DeviceAdapterTagSerial.h
VirtualObjectTransferSerial.h
)
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
set(headers ${headers}
VirtualObjectTransferSerial.h
)
endif()
vtkm_declare_headers(${headers})
target_sources(vtkm_cont PRIVATE
......
......@@ -15,9 +15,14 @@ set(headers
DeviceAdapterTagTBB.h
FunctorsTBB.h
ParallelSortTBB.h
VirtualObjectTransferTBB.h
)
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
set(headers ${headers}
VirtualObjectTransferTBB.h
)
endif()
vtkm_declare_headers(${headers}
ParallelSortTBB.hxx
parallel_sort.h
......
......@@ -31,7 +31,6 @@ set(headers
FieldNeighborhood.h
FunctorBase.h
ParametricCoordinates.h
PointLocator.h
PointLocatorSparseGrid.h
TaskBase.h
)
......@@ -43,6 +42,7 @@ set(header_impls
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
set(headers ${headers}
CellLocator.h
PointLocator.h
)
endif()
......
......@@ -55,7 +55,6 @@ set(headers
ArrayPortalHelpers.h
ArrayPortalUniformPointCoordinates.h
ArrayPortalValueReference.h
ArrayPortalVirtual.h
Assume.h
brigand.hpp
ConfigureFor32.h
......@@ -76,6 +75,12 @@ set(headers
Windows.h
)
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
set(headers ${headers}
ArrayPortalVirtual.h
)
endif()
vtkm_declare_headers(${headers})
vtkm_pyexpander_generated_file(FunctionInterfaceDetailPre.h)
......
Supports Markdown
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