From 9a73bfeb85fa842d962cfd342df85601a5b0e7fa Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 31 Jan 2011 10:45:03 +0100 Subject: add GOTO2 and clean a bit the cmake macros --- bench/btl/cmake/FindATLAS.cmake | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'bench/btl/cmake/FindATLAS.cmake') diff --git a/bench/btl/cmake/FindATLAS.cmake b/bench/btl/cmake/FindATLAS.cmake index df1a265c3..6b9065206 100644 --- a/bench/btl/cmake/FindATLAS.cmake +++ b/bench/btl/cmake/FindATLAS.cmake @@ -1,16 +1,7 @@ -# include(FindLibraryWithDebug) -if (ATLAS_INCLUDES AND ATLAS_LIBRARIES) +if (ATLAS_LIBRARIES) set(ATLAS_FIND_QUIETLY TRUE) -endif (ATLAS_INCLUDES AND ATLAS_LIBRARIES) - -find_path(ATLAS_INCLUDES - NAMES - cblas.h - PATHS - $ENV{ATLASDIR}/include - ${INCLUDE_INSTALL_DIR} -) +endif (ATLAS_LIBRARIES) find_file(ATLAS_LIB libatlas.so.3 PATHS /usr/lib $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) find_library(ATLAS_LIB atlas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) @@ -34,7 +25,8 @@ if(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) set(ATLAS_LIBRARIES ${ATLAS_LAPACK} ${ATLAS_CBLAS} ${ATLAS_F77BLAS} ${ATLAS_LIB}) # search the default lapack lib link to it - find_library(ATLAS_REFERENCE_LAPACK lapack PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) + find_file(ATLAS_REFERENCE_LAPACK liblapack.so.3 PATHS /usr/lib /usr/lib64) + find_library(ATLAS_REFERENCE_LAPACK NAMES lapack) if(ATLAS_REFERENCE_LAPACK) set(ATLAS_LIBRARIES ${ATLAS_LIBRARIES} ${ATLAS_REFERENCE_LAPACK}) endif() @@ -42,7 +34,6 @@ if(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) endif(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(ATLAS DEFAULT_MSG - ATLAS_INCLUDES ATLAS_LIBRARIES) +find_package_handle_standard_args(ATLAS DEFAULT_MSG ATLAS_LIBRARIES) -mark_as_advanced(ATLAS_INCLUDES ATLAS_LIBRARIES) +mark_as_advanced(ATLAS_LIBRARIES) -- cgit v1.2.3