[Cmake-commits] CMake branch, next, updated. v2.8.8-3512-gaa986c7

[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  aa986c72955983299cbe4122846dc34181478648 (commit)
       via  79a4e2bbdd0dfd8e2812160b118ac17f09d4bdb0 (commit)
       via  6b6c2e0b5c544a4a410f43f2f7bc721b20267dc3 (commit)
      from  f22d19f4edb4f96e869efbe2d20267e9186c352e (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=aa986c72955983299cbe4122846dc34181478648
commit aa986c72955983299cbe4122846dc34181478648
Merge: f22d19f 79a4e2b
Author:     Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Wed Jul 18 03:22:52 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 18 03:22:52 2012 -0400

    Merge topic 'findblas' into next
    
    79a4e2b Fixed: FindLAPACK does not find MKL 10.3 when using gcc 4.x
    6b6c2e0 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79a4e2bbdd0dfd8e2812160b118ac17f09d4bdb0
commit 79a4e2bbdd0dfd8e2812160b118ac17f09d4bdb0
Author:     Alexey Ozeritsky <aozeritsky at gmail.com>
AuthorDate: Wed Jul 18 11:17:45 2012 +0400
Commit:     Alexey Ozeritsky <aozeritsky at gmail.com>
CommitDate: Wed Jul 18 11:17:45 2012 +0400

    Fixed: FindLAPACK does not find MKL 10.3 when using gcc 4.x

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 9eadfd1..1cf31c4 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -484,8 +484,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
         # mkl >= 10.3
         if (CMAKE_C_COMPILER MATCHES ".+gcc.*")
           list(APPEND BLAS_SEARCH_LIBS
-            "mkl_blas95_lp64 mkl_intel_lp64 mkl_gnu_thread mkl_core")
-          set(LM "${LM};-lgomp")
+            "mkl_blas95_lp64 mkl_intel_lp64 mkl_gnu_thread mkl_core gomp")
         else ()
           list(APPEND BLAS_SEARCH_LIBS
             "mkl_blas95_lp64 mkl_intel_lp64 mkl_intel_thread mkl_core iomp5")
@@ -516,8 +515,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
         # mkl >= 10.3
         if (CMAKE_C_COMPILER MATCHES ".+gcc.*")
           list(APPEND BLAS_SEARCH_LIBS
-            "mkl_intel_lp64 mkl_gnu_thread mkl_core")
-          set(LM "${LM};-lgomp")
+            "mkl_intel_lp64 mkl_gnu_thread mkl_core gomp")
         else ()
           list(APPEND BLAS_SEARCH_LIBS
             "mkl_intel_lp64 mkl_intel_thread mkl_core iomp5")

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

Summary of changes:
 Modules/FindBLAS.cmake    |    6 ++----
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake