From baa7ae6e4731cd5b2e3345117a48fa17d7dba646 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Wed, 5 Jun 2024 09:47:45 -0600 Subject: [PATCH 1/2] Use the new func@2.1: instead of master --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 38ff881e..eca73fe5 100644 --- 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:" From b7cfe461b9838973123e9dae771ce8ff972b8ed0 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Wed, 5 Jun 2024 13:49:30 -0600 Subject: [PATCH 2/2] Fix handling of cxx standard --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34bd1cc7..77eaffce 100755 --- 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)