From c90d0c363b430e7d365b1c48ce84628330681e20 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Wed, 26 Jan 2011 19:39:10 +0100
Subject: improve automatic handling of gotoblas and atlas

---
 bench/btl/CMakeLists.txt        | 2 +-
 bench/btl/cmake/FindATLAS.cmake | 8 +++++++-
 bench/btl/cmake/FindGOTO.cmake  | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'bench/btl')

diff --git a/bench/btl/CMakeLists.txt b/bench/btl/CMakeLists.txt
index b7b2df37c..95ffbf42a 100644
--- a/bench/btl/CMakeLists.txt
+++ b/bench/btl/CMakeLists.txt
@@ -90,7 +90,7 @@ endmacro(btl_add_target_property)
 ENABLE_TESTING()
 
 add_subdirectory(libs/eigen3)
-add_subdirectory(libs/hand_vec)
+# add_subdirectory(libs/hand_vec)
 add_subdirectory(libs/gmm)
 add_subdirectory(libs/mtl4)
 add_subdirectory(libs/ublas)
diff --git a/bench/btl/cmake/FindATLAS.cmake b/bench/btl/cmake/FindATLAS.cmake
index b4a984abe..df1a265c3 100644
--- a/bench/btl/cmake/FindATLAS.cmake
+++ b/bench/btl/cmake/FindATLAS.cmake
@@ -30,9 +30,15 @@ find_file(ATLAS_F77BLAS libf77blas.so.3 PATHS /usr/lib $ENV{ATLASDIR} ${LIB_INST
 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_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})
+  if(ATLAS_REFERENCE_LAPACK)
+    set(ATLAS_LIBRARIES ${ATLAS_LIBRARIES} ${ATLAS_REFERENCE_LAPACK})
+  endif()
+  
 endif(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS)
 
 include(FindPackageHandleStandardArgs)
diff --git a/bench/btl/cmake/FindGOTO.cmake b/bench/btl/cmake/FindGOTO.cmake
index eb8b75b24..1e0dbabaf 100644
--- a/bench/btl/cmake/FindGOTO.cmake
+++ b/bench/btl/cmake/FindGOTO.cmake
@@ -12,8 +12,8 @@ find_path(GOTO_INCLUDES
   ${INCLUDE_INSTALL_DIR}
 )
 
-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})
+find_file(GOTO_LIBRARIES libgoto.so PATHS /usr/lib $ENV{GOTODIR} ${LIB_INSTALL_DIR})
+find_library(GOTO_LIBRARIES goto PATHS $ENV{GOTODIR} ${LIB_INSTALL_DIR})
 
 if(GOTO_LIBRARIES AND CMAKE_COMPILER_IS_GNUCXX)
   set(GOTO_LIBRARIES ${GOTO_LIBRARIES} "-lpthread -lgfortran")
-- 
cgit v1.2.3