Update weaver modules to use different git/cmake and

add c++17 to weaver build - towards #841 & #842
sandialabs · Oct 11, 2022 · 406a7eb · 406a7eb
1 parent 5b57d67
commit 406a7eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos b/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos
@@ -30,7 +30,6 @@ cmake \
     -D Trilinos_ASSERT_MISSING_PACKAGES:BOOL=OFF \
     -D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \
     -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \
-    -D Trilinos_ENABLE_CXX11:BOOL=ON \
     -D Trilinos_ENABLE_EXAMPLES:BOOL=OFF \
     -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON \
     -D Trilinos_VERBOSE_CONFIGURE:BOOL=OFF \
@@ -126,4 +125,5 @@ cmake \
     -D Kokkos_ENABLE_LIBDL:BOOL=ON \
     -D Trilinos_ENABLE_PanzerDofMgr:BOOL=ON \
     -D Trilinos_ENABLE_ShyLU_DDFROSch:BOOL=ON \
+    -D CMAKE_CXX_STANDARD=17 \
 ../
diff --git a/doc/dashboards/weaver.sandia.gov/weaver_modules_cuda.sh b/doc/dashboards/weaver.sandia.gov/weaver_modules_cuda.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 module purge 
-module load git/2.31.1 cmake/3.21.2
+module load git/2.10.1 cmake/3.24.2
 module load cuda/11.2.2/gcc/8.3.1
 module load openmpi/4.1.1/gcc/8.3.1/cuda/11.2.2
 module load openblas/0.3.18/gcc/8.3.1