Commit 3fc0f11d authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'export_vtkm_cuda_always'

71018e3b Always export vtkm_cuda no matter VTKm_INSTALL_ONLY_LIBRARIES
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1640
parents a5dbe1ec 71018e3b
......@@ -129,6 +129,7 @@ if(VTKm_ENABLE_CUDA)
if (NOT TARGET vtkm_cuda OR NOT TARGET vtkm::cuda)
add_library(vtkm_cuda INTERFACE)
set_target_properties(vtkm_cuda PROPERTIES EXPORT_NAME vtkm::cuda)
install(TARGETS vtkm_cuda EXPORT ${VTKm_EXPORT_NAME})
# Workaround issue with CUDA 8.X where virtual don't work when building
# VTK-m as shared. We don't want to force BUILD_SHARED_LIBS to a specific
......@@ -263,10 +264,6 @@ if(VTKm_ENABLE_CUDA)
if (NOT TARGET vtkm::cuda)
add_library(vtkm::cuda ALIAS vtkm_cuda)
if(NOT VTKm_INSTALL_ONLY_LIBRARIES)
install(TARGETS vtkm_cuda EXPORT ${VTKm_EXPORT_NAME})
endif()
endif()
endif()
......
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