[arrayfire] 20/41: Fixing the logic to find cblas.h in FindCBLAS.cmake

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit 08590100380f68f7e64872af309ca126245dee73
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Mon Mar 14 17:07:40 2016 -0400

    Fixing the logic to find cblas.h in FindCBLAS.cmake
---
 CMakeModules/FindCBLAS.cmake | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/CMakeModules/FindCBLAS.cmake b/CMakeModules/FindCBLAS.cmake
index db1d783..f64fd6f 100644
--- a/CMakeModules/FindCBLAS.cmake
+++ b/CMakeModules/FindCBLAS.cmake
@@ -109,7 +109,7 @@ MACRO(CHECK_ALL_LIBRARIES
     _flags
     _list
     _include
-    _search_include,
+    _search_include
     _libraries_work_check)
   # This macro checks for the existence of the combination of fortran libraries
   # given by _list.  If the combination is found, this macro checks (using the
@@ -168,11 +168,6 @@ MACRO(CHECK_ALL_LIBRARIES
       ENDIF(APPLE)
       MARK_AS_ADVANCED(${_prefix}_${_library}_LIBRARY)
 
-      IF(${_prefix}_${_library}_LIBRARY)
-        GET_FILENAME_COMPONENT(_path ${${_prefix}_${_library}_LIBRARY} PATH)
-        LIST(APPEND _paths ${_path}/../include ${_path}/../../include ${CBLAS_ROOT_DIR}/include)
-      ENDIF(${_prefix}_${_library}_LIBRARY)
-
       SET(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
       SET(_libraries_work ${${_prefix}_${_library}_LIBRARY})
     ENDIF(_libraries_work)
@@ -183,8 +178,17 @@ MACRO(CHECK_ALL_LIBRARIES
   SET(_bug_libraries_work_check ${_libraries_work_check}) #CMAKE BUG!!! SHOULD NOT BE THAT
 
   IF(_bug_search_include)
-    FIND_PATH(${_prefix}${_combined_name}_INCLUDE ${_include} ${_paths})
+    FIND_PATH(${_prefix}${_combined_name}_INCLUDE ${_include}
+      /opt/intel/mkl/include
+      /usr/include
+      /usr/local/include
+      /sw/include
+      /opt/local/include
+      PATH_SUFFIXES
+      openblas
+      )
     MARK_AS_ADVANCED(${_prefix}${_combined_name}_INCLUDE)
+
     IF(${_prefix}${_combined_name}_INCLUDE)
       IF (_verbose)
         MESSAGE(STATUS "Includes found")
@@ -194,6 +198,7 @@ MACRO(CHECK_ALL_LIBRARIES
     ELSE(${_prefix}${_combined_name}_INCLUDE)
       SET(_libraries_work FALSE)
     ENDIF(${_prefix}${_combined_name}_INCLUDE)
+
   ELSE(_bug_search_include)
     SET(${_prefix}_INCLUDE_DIR)
     SET(${_prefix}_INCLUDE_FILE ${_include})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git