From c170a72f7dbb99ab3aca16354635ef796eb92531 Mon Sep 17 00:00:00 2001
From: David Minton <daminton@purdue.edu>
Date: Thu, 18 Jan 2024 13:17:14 -0500
Subject: [PATCH] Put back some of the missing SHTOOLS stuff that got messed up
 in the merge

---
 CMakeLists.txt             |  8 +++-----
 cmake/Modules/SetMKL.cmake | 14 --------------
 pyproject.toml             |  5 +++--
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 cmake/Modules/SetMKL.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b2663034..ae81ba810 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,11 +59,14 @@ ELSE()
 
     IF (CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
         SET(COMPILER_OPTIONS "Intel" CACHE STRING "Compiler identified as Intel")
+        FIND_PACKAGE(MKL)
     ELSEIF (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
         SET(COMPILER_OPTIONS "GNU" CACHE STRING "Compiler identified as gfortran")
     ELSE ()
         MESSAGE(FATAL_ERROR "Compiler ${CMAKE_Fortran_COMPILER_ID} not recognized!") 
     ENDIF ()
+    FIND_PACKAGE(SHTOOLS REQUIRED)
+    FIND_PACKAGE(FFTW3 REQUIRED)
 
     # The following section is modified from Numpy f2py documentation
     IF(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
@@ -113,13 +116,8 @@ ELSE()
     ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
     INCLUDE(SetParallelizationLibrary)
 
-    IF (COMPILER_OPTIONS STREQUAL "Intel" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-        INCLUDE(SetMKL)
-    ENDIF ()
     INCLUDE(SetSwiftestFlags) 
 
-
-
     # The source for the SWIFTEST binary and have it placed in the bin folder
     ADD_SUBDIRECTORY(${SRC} ${CMAKE_INSTALL_BINDIR})
     ADD_SUBDIRECTORY(${PY})
diff --git a/cmake/Modules/SetMKL.cmake b/cmake/Modules/SetMKL.cmake
deleted file mode 100644
index e58c9f51a..000000000
--- a/cmake/Modules/SetMKL.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2022 - David Minton, Carlisle Wishard, Jennifer Pouplin, Jake Elliott, & Dana Singh
-# This file is part of Swiftest.
-# Swiftest is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
-# as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-# Swiftest is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with Swiftest. 
-# If not, see: https://www.gnu.org/licenses. 
-
-# Find MKL if not already found
-IF(NOT MKL_FOUND)
-    ENABLE_LANGUAGE(C) # Some libraries need a C compiler to find 
-    FIND_PACKAGE(MKL REQUIRED)
-ENDIF(NOT MKL_FOUND)
diff --git a/pyproject.toml b/pyproject.toml
index 1ada4eedf..a8a3b7cf8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,7 +37,8 @@ dependencies = [
     'astropy>=5.2',
     'astroquery>=0.4.6',
     'tqdm>=4.64.1',
-    'cython>=3.0.0'
+    'cython>=3.0.0',
+    'pyshtools>=4.10'
 ]
 
 [project.urls]
@@ -136,7 +137,7 @@ CMAKE_INSTALL_LIBDIR="lib"
 [tool.cibuildwheel.linux]
 skip = "cp312-* pp* -manylinux_i686* *-musllinux*"
 before-all = [
-    "yum install doxygen libxml2-devel libcurl-devel -y",
+    "yum install doxygen libxml2-devel libcurl-devel fftw-devel blas-devel lapack-devel -y",
     "buildscripts/build_dependencies.sh -p /usr/local"
 ]