From ba417f5493878e08fa7fd9b6e89d304e26d3e716 Mon Sep 17 00:00:00 2001
From: Izaak Beekman <zbeekman@gmail.com>
Date: Tue, 19 Dec 2023 15:48:05 -0800
Subject: [PATCH] Fix building on Windows during CI, I think?

---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e96cfc2f..226c3603 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,14 +281,15 @@ if(WIN32) # Only support building with GCC & GFortran using Intel MPI (OneAPI)
   set( MPI_ASSUME_NO_BUILTIN_MPI TRUE )
   set( MPI_CXX_SKIP_MPICXX TRUE )
   cmake_path(SET MPI_ROOT NORMALIZE "$ENV{I_MPI_ROOT}")
-  set (IMPI_LIB_DIR "${MPI_ROOT}/lib/${IMPI_BUILD}")
-  set (IMPI_DLL_DIR "${MPI_ROOT}/bin/${IMPI_BUILD}")
+  set (IMPI_LIB_DIR "${MPI_ROOT}/lib")
+  set (IMPI_DLL_DIR "${MPI_ROOT}/bin")
 
   message(STATUS "Looking in IMPI_LIB_DIR=${IMPI_LIB_DIR}")
   message(STATUS "Looking in IMPI_DLL_DIR=${IMPI_DLL_DIR}")
   find_library(IMPI_LIB
     "impi.lib"
     HINTS "${IMPI_LIB_DIR}"
+    PATH_SUFFIXES "${IMPI_BUILD}"
     DOC "Location of the Intel MPI impi.lib file"
     REQUIRED
     NO_DEFAULT_PATH)
@@ -296,6 +297,7 @@ if(WIN32) # Only support building with GCC & GFortran using Intel MPI (OneAPI)
   find_file(IMPI_DLL
     "impi.dll"
     HINTS "${IMPI_DLL_DIR}"
+    PATH_SUFFIXES "${IMPI_BUILD}"
     DOC "Location of the Intel MPI impi.dll file"
     REQUIRED
     NO_DEFAULT_PATH)