[clblas] 17/54: find libblas.so correctly. use libblas.so for testing by default instead of libacml.so

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository clblas.

commit c96ebc68eecb7b61f30384cfe50b1332cc51ddaa
Author: timmyliu <timmy.liu at amd.com>
Date:   Tue Nov 10 03:56:33 2015 -0600

    find libblas.so correctly. use libblas.so for testing by default instead of libacml.so
---
 src/CMakeLists.txt   | 4 ++--
 src/FindNetlib.cmake | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3dad311..f2034a7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,8 +82,8 @@ message( STATUS "You have confirmed OpenCL ${OPENCL_VERSION} is supported in you
 if ( APPLE )
 	set(CORR_TEST_WITH_ACML OFF CACHE BOOL "Use ACML library in correctness tests")
 else ( )
-	message(STATUS "CORR_TEST_WITH_ACML set to ON")
-	set(CORR_TEST_WITH_ACML ON CACHE BOOL "Use ACML library in correctness tests")
+	message(STATUS "CORR_TEST_WITH_ACML set to OFF. Try link with libblas.so")
+	set(CORR_TEST_WITH_ACML OFF CACHE BOOL "Use ACML library in correctness tests")
 endif( )
 
 if( CMAKE_GENERATOR MATCHES "NMake" )
diff --git a/src/FindNetlib.cmake b/src/FindNetlib.cmake
index 9e26103..a32474e 100644
--- a/src/FindNetlib.cmake
+++ b/src/FindNetlib.cmake
@@ -74,10 +74,10 @@ endif( )
 
 # The library name available from Netlib has different names for 64bit and 32bit libs
 if( LIB64 )
-	set( Netlib_BLAS_LIBNAME libblas )
+	set( Netlib_BLAS_LIBNAME blas )
 #	set( Netlib_BLAS_LIBNAME BLAS )  Even though the download is named BLAS, the linker expects the .dll to be called libblas.dll
 else( )
-	set( Netlib_BLAS_LIBNAME libblas )
+	set( Netlib_BLAS_LIBNAME blas )
 endif( )
 
 list( FIND Netlib_FIND_COMPONENTS BLAS contains_BLAS )
@@ -91,6 +91,7 @@ if( NOT contains_BLAS EQUAL -1 )
 		PATHS
 			/usr/lib
 			/usr/local/lib
+			/usr/lib/libblas
 		DOC "Netlib dynamic library path"
 		PATH_SUFFIXES lib
 	)

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