Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Resolves Issue 52, we now install all vtkm files correctly.

Browse Source
This commit is contained in:
Robert Maynard 2016-02-22 13:15:30 -05:00
parent ea817bc7b8
commit bb90493920
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -304,6 +304,7 @@ install(
# Install Use files. # Install Use files.
install( install(
FILES FILES
${VTKm_SOURCE_DIR}/CMake/UseVTKmBase.cmake
${VTKm_SOURCE_DIR}/CMake/UseVTKmSerial.cmake ${VTKm_SOURCE_DIR}/CMake/UseVTKmSerial.cmake
${VTKm_SOURCE_DIR}/CMake/UseVTKmTBB.cmake ${VTKm_SOURCE_DIR}/CMake/UseVTKmTBB.cmake
${VTKm_SOURCE_DIR}/CMake/UseVTKmCUDA.cmake ${VTKm_SOURCE_DIR}/CMake/UseVTKmCUDA.cmake
@ -313,6 +314,7 @@ install(
# Install support files. # Install support files.
install( install(
FILES FILES
${VTKm_SOURCE_DIR}/CMake/VTKmMacros.cmake
${VTKm_SOURCE_DIR}/CMake/VTKmCompilerOptimizations.cmake ${VTKm_SOURCE_DIR}/CMake/VTKmCompilerOptimizations.cmake
${VTKm_SOURCE_DIR}/CMake/VTKmDetectCUDAVersion.cxx ${VTKm_SOURCE_DIR}/CMake/VTKmDetectCUDAVersion.cxx
DESTINATION ${VTKm_INSTALL_CMAKE_MODULE_DIR} DESTINATION ${VTKm_INSTALL_CMAKE_MODULE_DIR}

4
vtkm/exec/cuda/internal/CMakeLists.txt
View File

@ -23,6 +23,7 @@ set(headers
ExecutionPolicy.h ExecutionPolicy.h
IteratorFromArrayPortal.h IteratorFromArrayPortal.h
WrappedOperators.h WrappedOperators.h
ThrustPatches.h
) )
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@ -33,6 +34,9 @@ endif()
vtkm_declare_headers(CUDA ${headers} TESTABLE ${VTKm_ENABLE_CUDA}) vtkm_declare_headers(CUDA ${headers} TESTABLE ${VTKm_ENABLE_CUDA})
set_source_files_properties(ThrustPatches.h
PROPERTIES VTKm_CANT_BE_HEADER_TESTED TRUE)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
if (VTKm_ENABLE_CUDA) if (VTKm_ENABLE_CUDA)
add_subdirectory(testing) add_subdirectory(testing)