From: Daniel Arndt <arndtd@ornl.gov>
Date: Wed, 25 Oct 2023 17:46:03 +0000 (-0400)
Subject: Only include Kokkos_Abort.hpp in exceptions.h for Kokkos 4.2.0 and higher
X-Git-Tag: relicensing~361^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c782498fe8e62a98c499e505a6a1e22376c49aa4;p=dealii.git

Only include Kokkos_Abort.hpp in exceptions.h for Kokkos 4.2.0 and higher
---

diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h
index 1b9594e109..9a2600893c 100644
--- a/include/deal.II/base/exceptions.h
+++ b/include/deal.II/base/exceptions.h
@@ -19,7 +19,12 @@
 #include <deal.II/base/config.h>
 
 DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-#include <Kokkos_Core.hpp>
+#include <Kokkos_Macros.hpp>
+#if KOKKOS_VERSION >= 40200
+#  include <Kokkos_Abort.hpp>
+#else
+#  include <Kokkos_Core.hpp>
+#endif
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include <exception>