Merge pull request #181 from TimmyLiu/develop

find libblas.so correctly. use libblas.so for testing by default instead of libacml.so

Author: TimmyLiu

.travis.yml

@@ -43,6 +43,7 @@ addons:
       # boost-latest contains boost v1.55
       - boost-latest
     packages:
+      - gfortran
       # g++-4.8 is minimum version considered to be the first good c++11 gnu compiler
       # - g++-4.8
       # - clang-3.6

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" )

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
 	)