From d1d24fac02c09990fd7576a6c0b387926a34c621 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <fpruvost@inria.fr>
Date: Tue, 16 Jun 2015 17:07:04 +0200
Subject: [PATCH] add a suffix to look for (pt)scotch headers in the system

---
 CMakeModules/morse/find/FindBLAS.cmake     | 24 +++++++++++++---------
 CMakeModules/morse/find/FindPTSCOTCH.cmake |  3 ++-
 CMakeModules/morse/find/FindSCOTCH.cmake   |  3 ++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CMakeModules/morse/find/FindBLAS.cmake b/CMakeModules/morse/find/FindBLAS.cmake
index b1242f0d..8007ed34 100644
--- a/CMakeModules/morse/find/FindBLAS.cmake
+++ b/CMakeModules/morse/find/FindBLAS.cmake
@@ -1028,16 +1028,20 @@ endif (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
 # Generic BLAS library?
 if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
 
-    if(NOT BLAS_LIBRARIES)
-        check_fortran_libraries(
-        BLAS_LIBRARIES
-        BLAS
-        sgemm
-        ""
-        "blas"
-        ""
-        )
-    endif()
+    set(BLAS_SEARCH_LIBS "blas;blas_LINUX;blas_MAC;blas_WINDOWS")
+    foreach (SEARCH_LIB ${BLAS_SEARCH_LIBS})
+        if (BLAS_LIBRARIES)
+        else ()
+            check_fortran_libraries(
+            BLAS_LIBRARIES
+            BLAS
+            sgemm
+            ""
+            "${SEARCH_LIB}"
+            ""
+            )
+        endif()
+    endforeach ()
 
 endif (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
 
diff --git a/CMakeModules/morse/find/FindPTSCOTCH.cmake b/CMakeModules/morse/find/FindPTSCOTCH.cmake
index 5fe48d1a..26cf7f8f 100644
--- a/CMakeModules/morse/find/FindPTSCOTCH.cmake
+++ b/CMakeModules/morse/find/FindPTSCOTCH.cmake
@@ -132,7 +132,8 @@ else()
         set(PTSCOTCH_ptscotch.h_DIRS "PTSCOTCH_ptscotch.h_DIRS-NOTFOUND")
         find_path(PTSCOTCH_ptscotch.h_DIRS
           NAMES ptscotch.h
-          HINTS ${_inc_env})
+          HINTS ${_inc_env}
+          PATH_SUFFIXES "scotch")
     endif()
 endif()
 mark_as_advanced(PTSCOTCH_ptscotch.h_DIRS)
diff --git a/CMakeModules/morse/find/FindSCOTCH.cmake b/CMakeModules/morse/find/FindSCOTCH.cmake
index 6b00ae4c..86cd7cd7 100644
--- a/CMakeModules/morse/find/FindSCOTCH.cmake
+++ b/CMakeModules/morse/find/FindSCOTCH.cmake
@@ -115,7 +115,8 @@ else()
         set(SCOTCH_scotch.h_DIRS "SCOTCH_scotch.h_DIRS-NOTFOUND")
         find_path(SCOTCH_scotch.h_DIRS
           NAMES scotch.h
-          HINTS ${_inc_env})
+          HINTS ${_inc_env}
+          PATH_SUFFIXES "scotch")
     endif()
 endif()
 mark_as_advanced(SCOTCH_scotch.h_DIRS)
-- 
GitLab