diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2009-03-04 07:21:17 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2009-03-04 07:21:17 +0000 |
| commit | 45136ac3b6ea63e9f8b093ab0e8dd0b9eac6452a (patch) | |
| tree | 2ed6b7b6c76a8e8e2ef5466a72abc387554f135a /bench/btl/cmake | |
| parent | 3288e9e168bf89737aded54c4d98470a865d6fd3 (diff) | |
various update of of BTL
Diffstat (limited to 'bench/btl/cmake')
| -rw-r--r-- | bench/btl/cmake/FindATLAS.cmake | 28 | ||||
| -rw-r--r-- | bench/btl/cmake/FindGOTO.cmake | 4 |
2 files changed, 19 insertions, 13 deletions
diff --git a/bench/btl/cmake/FindATLAS.cmake b/bench/btl/cmake/FindATLAS.cmake index bba350ba7..b4a984abe 100644 --- a/bench/btl/cmake/FindATLAS.cmake +++ b/bench/btl/cmake/FindATLAS.cmake @@ -15,23 +15,25 @@ find_path(ATLAS_INCLUDES 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}) -# find_file(ATLAS_CBLAS libcblas.so.3 PATHS /usr/lib $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) -# find_library(ATLAS_CBLAS cblas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) +find_file(ATLAS_CBLAS libcblas.so.3 PATHS /usr/lib $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) +find_library(ATLAS_CBLAS cblas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) -# find_file(ATLAS_LAPACK liblapack_atlas.so.3 PATHS /usr/lib $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) -# find_library(ATLAS_LAPACK lapack_atlas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) +find_file(ATLAS_LAPACK liblapack_atlas.so.3 PATHS /usr/lib $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) +find_library(ATLAS_LAPACK lapack_atlas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) -# find_file(ATLAS_LAPACK liblapack.so.3 PATHS /usr/lib/atlas $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) -# find_library(ATLAS_LAPACK lapack PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) +if(NOT ATLAS_LAPACK) + find_file(ATLAS_LAPACK liblapack.so.3 PATHS /usr/lib/atlas $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) + find_library(ATLAS_LAPACK lapack PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) +endif(NOT ATLAS_LAPACK) -# find_file(ATLAS_F77BLAS libf77blas.so.3 PATHS /usr/lib $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) -# find_library(ATLAS_F77BLAS f77blas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) +find_file(ATLAS_F77BLAS libf77blas.so.3 PATHS /usr/lib $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) +find_library(ATLAS_F77BLAS f77blas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) -# if(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) -set(ATLAS_LIBRARIES ${ATLAS_LIB} ${ATLAS_LAPACK} -# ${ATLAS_CBLAS} ${ATLAS_LAPACK} ${ATLAS_F77BLAS} -) -# endif(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) +if(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) + + set(ATLAS_LIBRARIES ${ATLAS_LAPACK} ${ATLAS_CBLAS} ${ATLAS_F77BLAS} ${ATLAS_LIB}) + +endif(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ATLAS DEFAULT_MSG diff --git a/bench/btl/cmake/FindGOTO.cmake b/bench/btl/cmake/FindGOTO.cmake index b2b648b14..ad7eb3200 100644 --- a/bench/btl/cmake/FindGOTO.cmake +++ b/bench/btl/cmake/FindGOTO.cmake @@ -15,6 +15,10 @@ find_path(GOTO_INCLUDES find_file(GOTO_LIBRARIES libgotoblas.so PATHS /usr/lib $ENV{GOTODIR} ${LIB_INSTALL_DIR}) find_library(GOTO_LIBRARIES gotoblas PATHS $ENV{GOTODIR} ${LIB_INSTALL_DIR}) +if(GOTO_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX) + set(GOTO_LIBRARIES ${GOTO_LIBRARIES} "-lpthread") +endif(GOTO_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GOTO DEFAULT_MSG GOTO_INCLUDES GOTO_LIBRARIES) |