Install missing headers found by VTKmCheckSourceInInstall

This commit is contained in:
Robert Maynard 2019-01-29 14:28:19 -05:00
parent baaa47af43
commit c501500e1d
4 changed files with 11 additions and 7 deletions

@ -126,6 +126,7 @@ set(template_sources
StorageAny.hxx StorageAny.hxx
StorageBasic.hxx StorageBasic.hxx
StorageVirtual.hxx StorageVirtual.hxx
VirtualObjectHandle.hxx
) )
set(sources set(sources

@ -33,6 +33,5 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
add_subdirectory(internal) add_subdirectory(internal)
if(TARGET vtkm::cuda) #-----------------------------------------------------------------------------
add_subdirectory(cuda) add_subdirectory(cuda)
endif()

@ -83,6 +83,7 @@ set(headers
View1D.h View1D.h
View2D.h View2D.h
View3D.h View3D.h
Wireframer.h
WorldAnnotator.h WorldAnnotator.h
) )
@ -105,7 +106,6 @@ set(sources
MapperQuad.cxx MapperQuad.cxx
MapperRayTracer.cxx MapperRayTracer.cxx
MapperVolume.cxx MapperVolume.cxx
#MapperWireframer.cxx
Scene.cxx Scene.cxx
TextAnnotation.cxx TextAnnotation.cxx
TextAnnotationBillboard.cxx TextAnnotationBillboard.cxx
@ -190,14 +190,16 @@ vtkm_library(
WRAP_FOR_CUDA ${device_sources} WRAP_FOR_CUDA ${device_sources}
) )
# Install all headers no matter what backend was selected
vtkm_declare_headers(${opengl_headers})
vtkm_declare_headers(${osmesa_headers})
vtkm_declare_headers(${egl_headers})
if(VTKm_ENABLE_GL_CONTEXT) if(VTKm_ENABLE_GL_CONTEXT)
vtkm_declare_headers(${opengl_headers})
target_sources(vtkm_rendering PRIVATE ${opengl_sources}) target_sources(vtkm_rendering PRIVATE ${opengl_sources})
elseif(VTKm_ENABLE_OSMESA_CONTEXT) elseif(VTKm_ENABLE_OSMESA_CONTEXT)
vtkm_declare_headers(${opengl_headers} ${osmesa_headers})
target_sources(vtkm_rendering PRIVATE ${opengl_sources} ${osmesa_sources}) target_sources(vtkm_rendering PRIVATE ${opengl_sources} ${osmesa_sources})
elseif(VTKm_ENABLE_EGL_CONTEXT) elseif(VTKm_ENABLE_EGL_CONTEXT)
vtkm_declare_headers(${opengl_headers} ${egl_headers})
target_sources(vtkm_rendering PRIVATE ${opengl_sources} ${egl_sources}) target_sources(vtkm_rendering PRIVATE ${opengl_sources} ${egl_sources})
endif() endif()

@ -115,11 +115,13 @@ set(sources_device
add_subdirectory(internal) add_subdirectory(internal)
add_subdirectory(clip) add_subdirectory(clip)
add_subdirectory(colorconversion) add_subdirectory(colorconversion)
add_subdirectory(connectivities)
add_subdirectory(contour) add_subdirectory(contour)
add_subdirectory(contourtree) add_subdirectory(contourtree)
add_subdirectory(contourtree_augmented) add_subdirectory(contourtree_augmented)
add_subdirectory(cosmotools) add_subdirectory(cosmotools)
add_subdirectory(gradient) add_subdirectory(gradient)
add_subdirectory(histogram)
add_subdirectory(splatkernels) add_subdirectory(splatkernels)
add_subdirectory(spatialstructure) add_subdirectory(spatialstructure)
add_subdirectory(tetrahedralize) add_subdirectory(tetrahedralize)