Updated mkl flags and removed unnecessary FindMKL.cmake file

MintonGroup · Feb 18, 2024 · 51810a5 · 51810a5
1 parent 4111a13
commit 51810a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,7 +77,6 @@ ELSE()
     # Add in the external dependency libraries 
     IF (CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
         SET(COMPILER_OPTIONS "Intel" CACHE STRING "Compiler identified as Intel")
-        FIND_PACKAGE(MKL) # Possibly not needed any more due to BLAS and LAPACK being found
     ELSEIF (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
         SET(COMPILER_OPTIONS "GNU" CACHE STRING "Compiler identified as gfortran")
     ELSE ()

diff --git a/cmake/Modules/FindMKL.cmake b/cmake/Modules/FindMKL.cmake
diff --git a/cmake/Modules/SetSwiftestFlags.cmake b/cmake/Modules/SetSwiftestFlags.cmake
@@ -101,7 +101,7 @@ ELSEIF (COMPILER_OPTIONS STREQUAL "Intel")
         )
         # Aligns a variable to a specified boundary and offset
         SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}"
-            Fortran "/align:all /align:array64byte" # Intel
+            Fortran "/align:all /align:array64byte" # Intel Windows
         )
         # Enables changing the variable and array memory layout
         SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}"
@@ -117,7 +117,10 @@ ELSEIF (COMPILER_OPTIONS STREQUAL "Intel")
         )
         # Enables changing the variable and array memory layout
         SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}"
-            Fortran "-pad" # Intel Windows
+            Fortran "-pad" # Intel 
+        )
+        SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}"
+            Fortran "-mkl" # Intel 
         )
     ENDIF ()
 ENDIF ()