[Cmake-commits] CMake branch, next, updated. v3.4.1-1879-gd24f98f

[Brad King]

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  d24f98fc29d6ce0a01218d30f89982b153c3e141 (commit)
       via  2b48f63ce38e49a5c3ee84aa3763da00c8af08f3 (commit)
      from  746af298c623980ebc96eb203adeffef4853628c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d24f98fc29d6ce0a01218d30f89982b153c3e141
commit d24f98fc29d6ce0a01218d30f89982b153c3e141
Merge: 746af29 2b48f63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 8 11:52:20 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 8 11:52:20 2016 -0500

    Merge topic 'FindBLAS-intel-64lp' into next
    
    2b48f63c FindBLAS: Fix pattern matching on BLAS vendor name


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b48f63ce38e49a5c3ee84aa3763da00c8af08f3
commit 2b48f63ce38e49a5c3ee84aa3763da00c8af08f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 8 11:47:39 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 8 11:48:02 2016 -0500

    FindBLAS: Fix pattern matching on BLAS vendor name
    
    The if(STREQUAL) expressions do not support globbing expressions.
    Use regular experssions with MATCHES instead.
    
    Reported-by: Yahui Wang <youngqv at foxmail.com>

diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 6a583d9..416b666 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -494,18 +494,18 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
         list(APPEND BLAS_SEARCH_LIBS_WIN_MAIN
           "mkl_blas95${BLAS_mkl_DLL_SUFFIX} mkl_intel_c${BLAS_mkl_DLL_SUFFIX}")
       endif()
-      if (BLA_VENDOR STREQUAL "Intel10_64lp*" OR BLA_VENDOR STREQUAL "All")
+      if (BLA_VENDOR MATCHES "^Intel10_64lp" OR BLA_VENDOR STREQUAL "All")
         list(APPEND BLAS_SEARCH_LIBS_WIN_MAIN
           "mkl_blas95_lp64${BLAS_mkl_DLL_SUFFIX} mkl_intel_lp64${BLAS_mkl_DLL_SUFFIX}")
       endif ()
 
       # Add threading/sequential libs
       set(BLAS_SEARCH_LIBS_WIN_THREAD "")
-      if (BLA_VENDOR STREQUAL "*_seq" OR BLA_VENDOR STREQUAL "All")
+      if (BLA_VENDOR MATCHES "_seq$" OR BLA_VENDOR STREQUAL "All")
         list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD
           "mkl_sequential${BLAS_mkl_DLL_SUFFIX}")
       endif()
-      if (NOT BLA_VENDOR STREQUAL "*_seq" OR BLA_VENDOR STREQUAL "All")
+      if (NOT BLA_VENDOR MATCHES "_seq$" OR BLA_VENDOR STREQUAL "All")
         # old version
         list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD
           "libguide40 mkl_intel_thread${BLAS_mkl_DLL_SUFFIX}")
@@ -561,14 +561,14 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
         list(APPEND BLAS_SEARCH_LIBS_WIN_MAIN
           "mkl_intel_c${BLAS_mkl_DLL_SUFFIX}")
       endif()
-      if (BLA_VENDOR STREQUAL "Intel10_64lp*" OR BLA_VENDOR STREQUAL "All")
+      if (BLA_VENDOR MATCHES "^Intel10_64lp" OR BLA_VENDOR STREQUAL "All")
         list(APPEND BLAS_SEARCH_LIBS_WIN_MAIN
           "mkl_intel_lp64${BLAS_mkl_DLL_SUFFIX}")
       endif ()
 
       # Add threading/sequential libs
       set(BLAS_SEARCH_LIBS_WIN_THREAD "")
-      if (NOT BLA_VENDOR STREQUAL "*_seq" OR BLA_VENDOR STREQUAL "All")
+      if (NOT BLA_VENDOR MATCHES "_seq$" OR BLA_VENDOR STREQUAL "All")
         # old version
         list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD
           "libguide40 mkl_intel_thread${BLAS_mkl_DLL_SUFFIX}")
@@ -576,7 +576,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
         list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD
           "libiomp5md mkl_intel_thread${BLAS_mkl_DLL_SUFFIX}")
       endif()
-      if (BLA_VENDOR STREQUAL "*_seq" OR BLA_VENDOR STREQUAL "All")
+      if (BLA_VENDOR MATCHES "_seq$" OR BLA_VENDOR STREQUAL "All")
         list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD
           "mkl_sequential${BLAS_mkl_DLL_SUFFIX}")
       endif()

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

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


hooks/post-receive
-- 
CMake