[shark] 03/58: tried to fix ATLAS Ubuntu problem

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository shark.

commit d97f4133b7107996da7f14f25b65470d9c9f220e
Author: Oswin <oswin.krause at di.ku.dk>
Date:   Thu Jan 14 09:23:14 2016 +0100

    tried to fix ATLAS Ubuntu problem
---
 CMakeLists.txt | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e5c5cd..752f818 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,10 +258,22 @@ if( ENABLE_CBLAS )
 		endif()
 		if(CBLAS_LIB_PATH)
 			find_file(CBLAS_INCLUDES cblas.h 
-				PATHS ${CBLAS_LIB_PATH} ${CBLAS_LIB_PATH}/../include ${CBLAS_LIB_PATH}/../../include/atlas
+				PATHS ${CBLAS_LIB_PATH} ${CBLAS_LIB_PATH}/../include
 			)
 			get_filename_component(CBLAS_INCLUDES ${CBLAS_INCLUDES} PATH )
 		endif()
+		if(ATLAS_LIBRARY)
+			get_filename_component(ATLAS_LIBRARY_PATH ${ATLAS_LIBRARY} PATH )
+			find_file(CLAPACK_INCLUDES clapack.h 
+				PATHS
+				${ATLAS_LIBRARY_PATH} 
+				${ATLAS_LIBRARY_PATH}/../include
+				${ATLAS_LIBRARY_PATH}/../include/atlas
+				${ATLAS_LIBRARY_PATH}/../../include/atlas
+			)
+			
+			set(CBLAS_INCLUDES "${CBLAS_INCLUDES} ${CLAPACK_INCLUDES}")
+		endif()
 
 		if( OPENBLAS_LIBRARY AND CBLAS_INCLUDES)
 			set(CBLAS_VENDOR "OpenBLAS")

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