diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-18 13:42:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-18 13:42:34 (GMT) |
| commit | 349fb099ebb9bf3abae7365a78d8b9a5da9e65b5 (patch) | |
| tree | 450bc7490822bede3e37dac7009ce0dd8bee6755 /Modules | |
| parent | 3252bc447636b2345485704d646ce8739db12dfa (diff) | |
| parent | 8d5a07ce761a80aec54bfd84aaf5d3317f53bcd1 (diff) | |
| download | CMake-349fb099ebb9bf3abae7365a78d8b9a5da9e65b5.zip CMake-349fb099ebb9bf3abae7365a78d8b9a5da9e65b5.tar.gz CMake-349fb099ebb9bf3abae7365a78d8b9a5da9e65b5.tar.bz2 | |
Merge topic 'mkl-lib-dir'
8d5a07ce76 FindLAPACK: Extend search directories for MKL
d880d2805f FindBLAS: Extend search directories for MKL
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4905
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBLAS.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindLAPACK.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 4c569b3..c5d791e 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -483,7 +483,9 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All") endif() set(BLAS_mkl_LIB_PATH_SUFFIXES "compiler/lib" "compiler/lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}" + "compiler/lib/${BLAS_mkl_ARCH_NAME}" "mkl/lib" "mkl/lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}" + "mkl/lib/${BLAS_mkl_ARCH_NAME}" "lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}") foreach(IT ${BLAS_SEARCH_LIBS}) diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake index e275946..a18cec4 100644 --- a/Modules/FindLAPACK.cmake +++ b/Modules/FindLAPACK.cmake @@ -289,7 +289,9 @@ if(BLAS_FOUND) endif() set(LAPACK_mkl_LIB_PATH_SUFFIXES "compiler/lib" "compiler/lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}" + "compiler/lib/${LAPACK_mkl_ARCH_NAME}" "mkl/lib" "mkl/lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}" + "mkl/lib/${LAPACK_mkl_ARCH_NAME}" "lib/${LAPACK_mkl_ARCH_NAME}_${LAPACK_mkl_OS_NAME}") # First try empty lapack libs |