[Cmake-commits] CMake branch, next, updated. v2.8.5-1761-gb71a005

[Alexey Ozeritsky]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b71a005ee45776d9ddf648ffa418a2b056f6c30f (commit)
       via  0cc8f05ce5669f78d458c914b17695c5d53a8d52 (commit)
      from  4de0eb1df85e0fa05329a997fa49f7e48fa92205 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b71a005ee45776d9ddf648ffa418a2b056f6c30f
commit b71a005ee45776d9ddf648ffa418a2b056f6c30f
Merge: 4de0eb1 0cc8f05
Author:     Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Thu Sep 1 02:54:41 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 1 02:54:41 2011 -0400

    Merge topic 'FindLAPACK_FindBLAS' into next
    
    0cc8f05 FindBLAS/LAPACK fixes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cc8f05ce5669f78d458c914b17695c5d53a8d52
commit 0cc8f05ce5669f78d458c914b17695c5d53a8d52
Author:     Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Thu Sep 1 10:52:20 2011 +0400
Commit:     Alexey Ozeritsky <aozeritsky at gmail.com>
CommitDate: Thu Sep 1 10:54:48 2011 +0400

    FindBLAS/LAPACK fixes
    
     fixed: CMAKE_FIND_LIBRRAY_SUFFIXES misprint
     added: ATLAS vendor to FindLAPACK module

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 9d1cf3f..9b76d90 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -91,17 +91,17 @@ foreach(_library ${_list})
   if(_libraries_work)
     if (BLA_STATIC)
       if (WIN32)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRRAY_SUFFIXES})
+        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
       endif ( WIN32 )
       if (APPLE)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRRAY_SUFFIXES})
+        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
       else (APPLE)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRRAY_SUFFIXES})
+        set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
       endif (APPLE)
     else (BLA_STATIC)
       if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
         # for ubuntu's libblas3gf and liblapack3gf packages
-        set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRRAY_SUFFIXES} .so.3gf)
+        set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)
       endif ()
     endif (BLA_STATIC)
     find_library(${_prefix}_${_library}_LIBRARY
@@ -356,7 +356,7 @@ if (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All")
      BLAS_LIBRARIES
      BLAS
      sgemm
-     "" "acml_mp;acml_mv;CALBLAS" "" ${BLAS_ACML_GPU_LIB_DIRS}
+     "" "acml;acml_mv;CALBLAS" "" ${BLAS_ACML_GPU_LIB_DIRS}
    )
    if( BLAS_LIBRARIES )
     break()
@@ -368,7 +368,7 @@ if (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All")
      BLAS_LIBRARIES
      BLAS
      sgemm
-     "" "acml_mp;acml_mv" "" ${BLAS_ACML_LIB_DIRS}
+     "" "acml;acml_mv" "" ${BLAS_ACML_LIB_DIRS}
    )
    if( BLAS_LIBRARIES )
     break()
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
index 240dd97..bccf789 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -203,7 +203,9 @@ if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
   endif ( NOT LAPACK_LIBRARIES )
 endif (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
 # Generic LAPACK library?
-if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
+if (BLA_VENDOR STREQUAL "Generic" OR
+    BLA_VENDOR STREQUAL "ATLAS" OR
+    BLA_VENDOR STREQUAL "All")
   if ( NOT LAPACK_LIBRARIES )
     check_lapack_libraries(
     LAPACK_LIBRARIES
@@ -215,7 +217,7 @@ if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
     ""
     )
   endif ( NOT LAPACK_LIBRARIES )
-endif (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
+endif ()
 #intel lapack
  if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
   if (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindBLAS.cmake   |   12 ++++++------
 Modules/FindLAPACK.cmake |    6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake