Merge topic 'findblas_mklroot_bla_vendor'

89ab54c112 FindBLAS: Choose MKL arch based on BLA_VENDOR

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3330

Modules/FindBLAS.cmake

@@ -403,20 +403,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
       endif ()
 
       if (DEFINED ENV{MKLROOT})
-        set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}")
+        if (BLA_VENDOR STREQUAL "Intel10_32")
+          set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/ia32")
+        elseif (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR MATCHES "^Intel10_64i?lp_seq$")
+          set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/intel64")
+        endif ()
       endif ()
       if (_BLAS_MKLROOT_LIB_DIR)
-        if( SIZEOF_INTEGER EQUAL 8 )
-          set( _BLAS_MKL_PATH_PREFIX "intel64" )
-        else()
-          set( _BLAS_MKL_PATH_PREFIX "ia32" )
-        endif()
         if (WIN32)
-          string(APPEND _BLAS_MKLROOT_LIB_DIR "/lib/${_BLAS_MKL_PATH_PREFIX}_win")
+          string(APPEND _BLAS_MKLROOT_LIB_DIR "_win")
         elseif (APPLE)
-          string(APPEND _BLAS_MKLROOT_LIB_DIR "/lib/${_BLAS_MKL_PATH_PREFIX}_mac")
+          string(APPEND _BLAS_MKLROOT_LIB_DIR "_mac")
         else ()
-          string(APPEND _BLAS_MKLROOT_LIB_DIR "/lib/${_BLAS_MKL_PATH_PREFIX}_lin")
+          string(APPEND _BLAS_MKLROOT_LIB_DIR "_lin")
         endif ()
       endif ()