From bf81f812a525adc35ce6a5876342e1bad06f9d28 Mon Sep 17 00:00:00 2001
From: willdunklin <54944980+willdunklin@users.noreply.github.com>
Date: Wed, 12 Apr 2023 00:36:48 -0400
Subject: ascent: patch v0.9.0 for finding RAJA (#36645)

---
 .../packages/ascent/ascent-find-raja-pr1123.patch  | 39 ++++++++++++++++++++++
 var/spack/repos/builtin/packages/ascent/package.py |  3 ++
 2 files changed, 42 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/ascent/ascent-find-raja-pr1123.patch

diff --git a/var/spack/repos/builtin/packages/ascent/ascent-find-raja-pr1123.patch b/var/spack/repos/builtin/packages/ascent/ascent-find-raja-pr1123.patch
new file mode 100644
index 0000000000..06dddd7c8c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ascent/ascent-find-raja-pr1123.patch
@@ -0,0 +1,39 @@
+diff --git a/src/cmake/thirdparty/SetupRAJA.cmake b/src/cmake/thirdparty/SetupRAJA.cmake
+index 4026f98d..92c92635 100644
+--- a/src/cmake/thirdparty/SetupRAJA.cmake
++++ b/src/cmake/thirdparty/SetupRAJA.cmake
+@@ -12,9 +12,12 @@ set(_RAJA_SEARCH_PATH)
+ if(EXISTS ${RAJA_DIR}/share/raja/cmake)
+   # old install layout
+   set(_RAJA_SEARCH_PATH ${RAJA_DIR}/share/raja/cmake)
+-else()
++elseif(EXISTS ${RAJA_DIR}/lib/cmake/raja)
+   # new install layout
+   set(_RAJA_SEARCH_PATH ${RAJA_DIR}/lib/cmake/raja)
++else ()
++  # try RAJA_DIR itself
++  set(_RAJA_SEARCH_PATH ${RAJA_DIR})
+ endif()
+ 
+ message(STATUS "Looking for RAJA in: ${RAJA_DIR}")
+diff --git a/src/config/ascent_setup_deps.cmake b/src/config/ascent_setup_deps.cmake
+index 5839a03f..fd82b979 100644
+--- a/src/config/ascent_setup_deps.cmake
++++ b/src/config/ascent_setup_deps.cmake
+@@ -218,11 +218,14 @@ if(RAJA_DIR)
+     if(EXISTS ${RAJA_DIR}/share/raja/cmake)
+       # old install layout
+       set(_RAJA_SEARCH_PATH ${RAJA_DIR}/share/raja/cmake)
+-    else()
++    elseif(EXISTS ${RAJA_DIR}/lib/cmake/raja)
+       # new install layout
+       set(_RAJA_SEARCH_PATH ${RAJA_DIR}/lib/cmake/raja)
++    else ()
++      # try RAJA_DIR itself
++      set(_RAJA_SEARCH_PATH ${RAJA_DIR})
+     endif()
+-    
++
+     if(NOT EXISTS ${_RAJA_SEARCH_PATH})
+         message(FATAL_ERROR "Could not find RAJA CMake include file (${_RAJA_SEARCH_PATH})")
+     endif()
diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py
index c229f7fba1..bf35d976c9 100644
--- a/var/spack/repos/builtin/packages/ascent/package.py
+++ b/var/spack/repos/builtin/packages/ascent/package.py
@@ -114,6 +114,9 @@ class Ascent(CMakePackage, CudaPackage):
     # patch for finding Conduit python more reliably
     # https://github.com/Alpine-DAV/ascent/pull/935
     patch("ascent-find-conduit-python-pr935.patch", when="@0.8.0")
+    # patch for finding RAJA more reliably
+    # https://github.com/Alpine-DAV/ascent/pull/1123
+    patch("ascent-find-raja-pr1123.patch", when="@0.9.0")
 
     ##########################################################################
     # package dependencies
-- 
cgit v1.2.3-60-g2f50