Skip to content

Commit e6dd98c

Browse files
committed
I think VISKORES_VERSION needs to be set to 1 here
1 parent 84b75c3 commit e6dd98c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

scripts/uberenv_configs/packages/ascent/ascent-shared-cuda-pr903.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ index 5dbd9aa3..b0dbde2c 100644
247247
endif()
248248

249249
+if(ENABLE_CUDA AND BUILD_SHARED_LIBS)
250-
+ if(Viskores_VERSION VERSION_LESS "1.7.0")
251-
+ message(FATAL_ERROR "Cannot build shared libs with CUDA when Viskores is < v1.7.0")
250+
+ if(VISKORES_VERSION VERSION_LESS "1.0.0")
251+
+ message(FATAL_ERROR "Cannot build shared libs with CUDA when Viskores is < v1.0.0")
252252
+ endif()
253253
+endif()
254254

src/cmake/thirdparty/SetupViskores.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ if(ENABLE_CUDA AND NOT Viskores_ENABLE_CUDA)
3232
endif()
3333

3434
if(ENABLE_CUDA AND BUILD_SHARED_LIBS)
35-
if(Viskores_VERSION VERSION_LESS "1.7.0")
36-
message(FATAL_ERROR "Cannot build shared libs with CUDA when Viskores is < v1.7.0")
35+
if(VISKORES_VERSION VERSION_LESS "1.0.0")
36+
message(FATAL_ERROR "Cannot build shared libs with CUDA when Viskores is < v1.0.0")
3737
endif()
3838
endif()
3939

src/config/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ endif()
7272

7373
if(VISKORES_DIR)
7474
set(ASCENT_VISKORES_DIR ${VISKORES_DIR} )
75-
set(ASCENT_VISKORES_VERSION ${Viskores_VERSION} )
75+
set(ASCENT_VISKORES_VERSION ${VISKORES_VERSION} )
7676
endif()
7777

7878
if(MFEM_DIR)

src/docs/sphinx/Releases.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Preferred dependency versions for [email protected]
164164
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
165165

166166
167-
* [email protected] (with required `patch <https://github.com/Alpine-DAV/ascent/blob/0aef6cffd522be7419651e6adf586f9a553297d0/scripts/build_ascent/2024_05_03_vtk-m-mr3215-ext-geom-fix.patch>`_ )
167+
* [email protected] (with required `patch <https://github.com/Alpine-DAV/ascent/blob/0aef6cffd522be7419651e6adf586f9a553297d0/scripts/build_ascent/2024_05_03_vtkm-mr3215-ext-geom-fix.patch>`_ )
168168
169169
170170

0 commit comments

Comments
 (0)