From: Timo Heister <timo.heister@gmail.com>
Date: Fri, 24 May 2024 21:13:56 +0000 (-0400)
Subject: fix clang 14 on OSX compilation with Trilinos 14
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b91c9964b3727e3ed16c88334c9bae5e2deb13;p=candi.git

fix clang 14 on OSX compilation with Trilinos 14

fix
---

diff --git a/deal.II-toolchain/platforms/supported/macos.platform b/deal.II-toolchain/platforms/supported/macos.platform
index bbf12c5..888f600 100644
--- a/deal.II-toolchain/platforms/supported/macos.platform
+++ b/deal.II-toolchain/platforms/supported/macos.platform
@@ -54,4 +54,7 @@ if [ "$(machine)" = "arm64e" ]; then
   # disable this for now.
   TRILINOS_WITH_SEACAS=OFF
 
+  # Trilinos defaults to c++17 while deal.II 9.5 defaults to c++14 with clang 14,
+  # which then fails to compile when including Kokkos coming from Trilinos:
+  DEAL_II_CONFOPTS="-DCMAKE_CXX_STANDARD=17 ${DEAL_II_CONFOPTS}"
 fi