893c5271ac
* Update package versions for Ascent/SDK * Umpire build static for cuda from dray * Propagate cuda_arch for ascent and dray packages. * Ascent: Update dependency versions for ascent@0.8: * VTK-h: Patch +shared+cuda for VTK-h 0.8.x * Ascent: Patch to allow @0.8: +shared+cuda * Turn off building ascent tests. * Update ascent patch * WIP: Ascent: Update patch to configure MPI build with CUDA * Ascent: Tests require vtk-m+testlib * WIP: Ascent: Constrain 0.7 for vtk-h * Ascent: Directly depend on VTK-m
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 1379294..6de15c3 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -61,11 +61,6 @@ if(NOT ENABLE_SERIAL AND NOT ENABLE_MPI)
|
|
"Please set ENABLE_SERIAL, ENABLE_MPI or both to ON")
|
|
endif()
|
|
|
|
-
|
|
-if(ENABLE_CUDA AND BUILD_SHARED_LIBS)
|
|
- message(FATAL_ERROR "Static libraries are required when building with CUDA")
|
|
-endif()
|
|
-
|
|
if(ENABLE_CUDA)
|
|
# ask politely a few times for SEPARABLE COMPILATION
|
|
set (CMAKE_CUDA_SEPARABLE_COMPILATION ON CACHE BOOL "" )
|
|
diff --git a/src/cmake/thirdparty/SetupVTKm.cmake b/src/cmake/thirdparty/SetupVTKm.cmake
|
|
index 1bc5b56..e242738 100644
|
|
--- a/src/cmake/thirdparty/SetupVTKm.cmake
|
|
+++ b/src/cmake/thirdparty/SetupVTKm.cmake
|
|
@@ -64,6 +64,11 @@ if(ENABLE_CUDA AND NOT VTKm_ENABLE_CUDA)
|
|
message(FATAL_ERROR "VTK-h CUDA support requires VTK-m with CUDA support (ENABLE_CUDA == TRUE, however VTKm_ENABLE_CUDA == FALSE")
|
|
endif()
|
|
|
|
+if(ENABLE_CUDA AND BUILD_SHARED_LIBS)
|
|
+ if(VTKm_VERSION VERSION_LESS "1.7.0")
|
|
+ message(FATAL_ERROR "Cannot build shared libs with CUDA when VTKm is < v1.7.0")
|
|
+ endif()
|
|
+endif()
|
|
|
|
set(VTKM_FOUND TRUE)
|
|
|