[Cmake-commits] CMake branch, next, updated. v2.8.3-929-g889d86a

[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  889d86af1ff6a1d36131dee80494ee6c5ec2dbcd (commit)
       via  cabafa37fbd4a8b02e90667476d7568caddff178 (commit)
      from  b0d40417db66ae5595292045ad92e736c8357194 (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=889d86af1ff6a1d36131dee80494ee6c5ec2dbcd
commit 889d86af1ff6a1d36131dee80494ee6c5ec2dbcd
Merge: b0d4041 cabafa3
Author:     Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Thu Dec 16 06:42:01 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 16 06:42:01 2010 -0500

    Merge topic 'FindBLAS_FindLAPACK' into next
    
    cabafa3 ACML find fixes (issue 0011219)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cabafa37fbd4a8b02e90667476d7568caddff178
commit cabafa37fbd4a8b02e90667476d7568caddff178
Author:     Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Thu Dec 16 14:40:58 2010 +0300
Commit:     Alexey Ozeritsky <aozeritsky at gmail.com>
CommitDate: Thu Dec 16 14:40:58 2010 +0300

    ACML find fixes (issue 0011219)

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 17b070b..b605164 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -237,13 +237,24 @@ endif (BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
 
 #BLAS in acml library?
 if (BLA_VENDOR STREQUAL "ACML" OR BLA_VENDOR STREQUAL "All")
+ # Either acml or acml_mp should be in LD_LIBRARY_PATH but not both
  if(NOT BLAS_LIBRARIES)
   check_fortran_libraries(
   BLAS_LIBRARIES
   BLAS
   sgemm
   ""
-  "acml"
+  "acml;acml_mv"
+  ""
+  )
+ endif(NOT BLAS_LIBRARIES)
+ if(NOT BLAS_LIBRARIES)
+  check_fortran_libraries(
+  BLAS_LIBRARIES
+  BLAS
+  sgemm
+  ""
+  "acml_mp;acml_mv"
   ""
   )
  endif(NOT BLAS_LIBRARIES)

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

Summary of changes:
 Modules/FindBLAS.cmake |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake