mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 18:45:43 +00:00
Merge topic 'update_cmake_install_rules'
bb904939 Resolves Issue 52, we now install all vtkm files correctly. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !342
This commit is contained in:
commit
ad0efb7c0e
@ -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}
|
||||||
|
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user