Merge branch 'develop' of github.com:Chrismarsh/CHM into develop

Chrismarsh · Jun 12, 2024 · cdabe13 · cdabe13
2 parents d163a3a + b7cfe46
commit cdabe13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,9 +13,12 @@ cmake_policy(SET CMP0042 NEW)
 # Use _ROOT
 cmake_policy(SET CMP0144 NEW)
 
-#set(CMAKE_CXX_STANDARD 20)
-#set(CMAKE_CXX_STANDARD_REQUIRED ON)
-#set(CMAKE_CXX_EXTENSIONS OFF)
+# Needed in addition to the target cxx standard set later
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Set these off for kokkos compatibility
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(Boost_NO_WARN_NEW_VERSIONS ON)
 

diff --git a/spack.yaml b/spack.yaml
@@ -27,7 +27,7 @@ spack:
   - tbb
   - eigen
   - meteoio
-  - "func@master ~openmp"
+  - "func@2.1: ~openmp"
   - "trilinos@15.0.0 +mpi"
   - jemalloc
   - "vtk@9.2:"